Changeset 137 for trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel

Timestamp:

Feb 16, 2011, 1:42:13 PM (14 years ago)

Author:

simerabe

Message:

replacing old ring versions with new one

Location:

trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel

Files:

• Makefile (modified) (1 diff)
• segmentation.h (modified) (3 diffs)
• soft/main.c (modified) (1 diff)
• top.cpp (modified) (3 diffs)

trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel/Makefile

@@ -1 +1 @@
 ARCH=mips32el
 SIMULATION_ARGS=100000
+SOCLIB_CC_ADD_ARGS=-t systemcass
 SOCLIB?=$(shell soclib-cc --getpath)
 export SOCLIB

trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel/segmentation.h

@@ -19 +19 @@
 //      base address required by MIPS processor
 /////////////////////////////////////////////////////////////////
-#define MMU
 
 #define RESET_BASE      0xBFC00000
@@ -36 +35 @@
 #define MC_M_SIZE       0x00200000
 
-/////////////////////////////////////////////////////////////////
-//      page table (initialised)
-/////////////////////////////////////////////////////////////////
-#define PTD_ADDR        0x40400000
-#define PTE_ADDR        0x40402000
-#define IPTE_ADDR       0x40403000
-#define TAB_SIZE        0x00010000
-
-#define V_TTY_BASE      0x00800000
-#define V_TIMER_BASE    0x00C00000      // timer virtual address
 //////////////////////////////////////////////////////////
 //      System devices
@@ -77 +66 @@
 #define XRAM_SIZE       0x00000008
 
-#define MC_R_BASE       0x20200000
-#define MC_R_SIZE       0x00000008
-
-#define CLEANUP_OFFSET  0x20200000

trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel/soft/main.c

@@ -8 +8 @@
 #define NPROCS 4
 #define SIZE 500 
-#define SORT_TYPE 2
+#define SORT_TYPE 0
 
 volatile int nprocs=NPROCS;

trunk/platforms/caba-ring-ccxcachev1_memcachev3-mipsel/top.cpp

@@ -41 +41 @@
         maptabp.add(Segment("text" , TEXT_BASE , TEXT_SIZE , IntTab(2), true));
         maptabp.add(Segment("tty"  , TTY_BASE  , TTY_SIZE  , IntTab(1), false));
-        maptabp.add(Segment("mc_r" , MC_R_BASE , MC_R_SIZE , IntTab(2), false, true, IntTab(0)));
         maptabp.add(Segment("mc_m" , MC_M_BASE , MC_M_SIZE , IntTab(2), true ));
-        maptabp.add(Segment("ptba" , PTD_ADDR , TAB_SIZE   , IntTab(2), true));
  
         std::cout << maptabp << std::endl;
@@ -52 +50 @@
         maptabc.add(Segment("c_proc2" , C_PROC2_BASE , C_PROC2_SIZE , IntTab(2), false, true, IntTab(2)));
         maptabc.add(Segment("c_proc3" , C_PROC3_BASE , C_PROC3_SIZE , IntTab(3), false, true, IntTab(3)));
-        maptabc.add(Segment("mc_r"    , MC_R_BASE , MC_R_SIZE , IntTab(4), false, false));
         maptabc.add(Segment("mc_m"  , MC_M_BASE , MC_M_SIZE  , IntTab(4), false, false));
         maptabc.add(Segment("reset", RESET_BASE, RESET_SIZE, IntTab(4), false, false));
         maptabc.add(Segment("excep", EXCEP_BASE, EXCEP_SIZE, IntTab(4), false, false));
         maptabc.add(Segment("text" , TEXT_BASE , TEXT_SIZE , IntTab(4), false, false));
-        maptabc.add(Segment("ptba" , PTD_ADDR  , TAB_SIZE  , IntTab(4), false, false));
 
         std::cout << maptabc << std::endl;
@@ -66 +62 @@
         maptabx.add(Segment("excep", EXCEP_BASE, EXCEP_SIZE, IntTab(0), false));
         maptabx.add(Segment("text" , TEXT_BASE , TEXT_SIZE , IntTab(0), false));
-        maptabx.add(Segment("ptba" , PTD_ADDR  , TAB_SIZE  , IntTab(0), false));
         
         std::cout << maptabx << std::endl;