Update lm32 toolchain with new refactored lm32 MMU

fallen · Jan 14, 2013 · 0dcd80f · 0dcd80f
1 parent ad74f21
commit 0dcd80f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/cpu/lm32.cpu b/cpu/lm32.cpu
@@ -101,12 +101,10 @@
                (EBA 7)
                (DC 8)
                (DEBA 9)
-	       (PSW 11)
                (JTX 14) (JRX 15)          
                (BP0 16) (BP1 17) (BP2 18) (BP3 19)
                (WP0 24) (WP1 25) (WP2 26) (WP3 27)     
-               (TLBVADDR 29) (TLBPADDR 30)
-	       (DTLBMA 29) (ITLBMA 30)
+               (PSW 29) (TLBVADDR 30) (TLBPADDR 31) (TLBBADVADDR 31)
               )
   )
   () ()

diff --git a/opcodes/lm32-desc.c b/opcodes/lm32-desc.c
@@ -185,7 +185,6 @@ static CGEN_KEYWORD_ENTRY lm32_cgen_opval_h_csr_entries[] =
   { "EBA", 7, {0, {{{0, 0}}}}, 0, 0 },
   { "DC", 8, {0, {{{0, 0}}}}, 0, 0 },
   { "DEBA", 9, {0, {{{0, 0}}}}, 0, 0 },
-  { "PSW", 11, {0, {{{0, 0}}}}, 0, 0 },
   { "JTX", 14, {0, {{{0, 0}}}}, 0, 0 },
   { "JRX", 15, {0, {{{0, 0}}}}, 0, 0 },
   { "BP0", 16, {0, {{{0, 0}}}}, 0, 0 },
@@ -196,16 +195,16 @@ static CGEN_KEYWORD_ENTRY lm32_cgen_opval_h_csr_entries[] =
   { "WP1", 25, {0, {{{0, 0}}}}, 0, 0 },
   { "WP2", 26, {0, {{{0, 0}}}}, 0, 0 },
   { "WP3", 27, {0, {{{0, 0}}}}, 0, 0 },
-  { "TLBVADDR", 29, {0, {{{0, 0}}}}, 0, 0 },
-  { "DTLBMA", 29, {0, {{{0, 0}}}}, 0, 0 },
-  { "TLBPADDR", 30, {0, {{{0, 0}}}}, 0, 0 },
-  { "ITLBMA", 30, {0, {{{0, 0}}}}, 0, 0 }
+  { "PSW", 29, {0, {{{0, 0}}}}, 0, 0 },
+  { "TLBVADDR", 30, {0, {{{0, 0}}}}, 0, 0 },
+  { "TLBPADDR", 31, {0, {{{0, 0}}}}, 0, 0 },
+  { "TLBBADVADDR", 31, {0, {{{0, 0}}}}, 0, 0 },
 };
 
 CGEN_KEYWORD lm32_cgen_opval_h_csr =
 {
   & lm32_cgen_opval_h_csr_entries[0],
-  25,
+  24,
   0, 0, 0, 0, ""
 };