Move sethaltnot and cleardebint.

Now it matches Krste's memory map.

diff --git a/debug_rom/debug_rom.S b/debug_rom/debug_rom.S
index 9c32691d30ca54760193285faf546f9aff842895..457104f05cfe0c71e8fc1daf2f16f3fd2b71ca99 100755 (executable)
--- a/debug_rom/debug_rom.S
+++ b/debug_rom/debug_rom.S
@@ -8,8 +8,8 @@
 #define DEBUG_RAM               0x400
 #define DEBUG_RAM_SIZE          64
 
-#define SETHALTNOT              0x100
-#define CLEARDEBINT             0x104
+#define CLEARDEBINT             0x100
+#define SETHALTNOT              0x10c
 
         .global entry
         .global resume

diff --git a/debug_rom/debug_rom.h b/debug_rom/debug_rom.h
index a619446d18c9a975f5265d74fc7caa7e7998ea63..bbd7f237a272085f6904eb6c1dd89197f3bfb872 100644 (file)
--- a/debug_rom/debug_rom.h
+++ b/debug_rom/debug_rom.h
@@ -1,7 +1,7 @@
 static const unsigned char debug_rom_raw[] = {
   0x6f, 0x00, 0x00, 0x06, 0x6f, 0x00, 0xc0, 0x00, 0x13, 0x04, 0xf0, 0xff,
   0x6f, 0x00, 0x80, 0x00, 0x13, 0x04, 0x00, 0x00, 0xf3, 0x24, 0x40, 0xf1,
-  0x23, 0x22, 0x90, 0x10, 0x0f, 0x00, 0xf0, 0x0f, 0xf3, 0x24, 0x00, 0xf1,
+  0x23, 0x20, 0x90, 0x10, 0x0f, 0x00, 0xf0, 0x0f, 0xf3, 0x24, 0x00, 0xf1,
   0x63, 0xc6, 0x04, 0x00, 0x83, 0x24, 0xc0, 0x43, 0x6f, 0x00, 0xc0, 0x01,
   0x93, 0x94, 0x14, 0x00, 0x63, 0xc6, 0x04, 0x00, 0x83, 0x34, 0x80, 0x43,
   0x6f, 0x00, 0xc0, 0x00, 0x13, 0x00, 0x00, 0x00, 0x23, 0x2e, 0x80, 0x42,
@@ -12,7 +12,7 @@ static const unsigned char debug_rom_raw[] = {
   0x73, 0x24, 0x00, 0xf1, 0x63, 0x46, 0x04, 0x00, 0x23, 0x2e, 0x90, 0x42,
   0x67, 0x00, 0x00, 0x40, 0x13, 0x14, 0x14, 0x00, 0x63, 0x46, 0x04, 0x00,
   0x23, 0x3c, 0x90, 0x42, 0x67, 0x00, 0x00, 0x40, 0x13, 0x00, 0x00, 0x00,
-  0x67, 0x00, 0x00, 0x40, 0x73, 0x24, 0x40, 0xf1, 0x23, 0x20, 0x80, 0x10,
+  0x67, 0x00, 0x00, 0x40, 0x73, 0x24, 0x40, 0xf1, 0x23, 0x26, 0x80, 0x10,
   0x73, 0x60, 0x04, 0x7b, 0x73, 0x24, 0x00, 0x7b, 0x13, 0x74, 0x04, 0x02,
   0xe3, 0x0c, 0x04, 0xfe, 0x6f, 0xf0, 0xdf, 0xfb
 };

diff --git a/riscv/decode.h b/riscv/decode.h
index 4480312bab8d37a6cd30046a1d389c6a1cb8d425..b607bf38a02daccce1b90daafa71b89eb38a8c4c 100644 (file)
--- a/riscv/decode.h
+++ b/riscv/decode.h
@@ -234,8 +234,8 @@ private:
 #define DEBUG_RAM_SIZE          64
 #define DEBUG_RAM_END           (DEBUG_RAM_START + DEBUG_RAM_SIZE)
 #define DEBUG_END               0xfff
-#define DEBUG_CLEARDEBINT       0x104
-#define DEBUG_SETHALTNOT        0x100
+#define DEBUG_CLEARDEBINT       0x100
+#define DEBUG_SETHALTNOT        0x10c
 #define DEBUG_SIZE              (DEBUG_END - DEBUG_START + 1)
 
 #endif