fix watchpoints

comex · Jan 8, 2012 · e4c8e0b · e4c8e0b
1 parent a4bb66a
commit e4c8e0b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 DATA = $(word 1,$(wildcard ./data ../data))
-CFLAGS += -fno-builtin -Wno-missing-field-initializers -DCIRCULAR -I$(DATA)
+CFLAGS += -fno-builtin -Wno-missing-field-initializers -DCIRCULAR -DWATCHPOINTS -I$(DATA)
-#CFLAGS += -DWATCHPOINTS -DTRACER
+#CFLAGS += -DTRACER
 CFLAGS += -DSPARTAN
 include $(DATA)/Makefile.common
 

diff --git a/creepasm.S b/creepasm.S
@@ -1,4 +1,5 @@
 .arm
+.align 2
 .globl _undef_handler
 _undef_handler:
     # ldr pc, _undef_saved

diff --git a/failsafe.S b/failsafe.S
@@ -1,6 +1,7 @@
 # int run_failsafe(&result, func, a1, a2)
 
 .arm
+.align 2
 .globl _run_failsafe
 _run_failsafe:
     push {r4-r7, lr}

diff --git a/protoss.c b/protoss.c
@@ -92,7 +92,7 @@ static struct watch_entry *watch_start;
 extern volatile struct watch_entry *watch_ptr;
 
 extern uint32_t thread_exception_return[]
-asm("$_A_80_00_0c_f1_90_9f_1d_ee_XX_83_99_e5_XX_50_98_e5_00_00_55_e3");
+asm("$_A_80_00_0c_f1_90_9f_1d_ee_XX_XX_99_e5_XX_50_98_e5_00_00_55_e3");
 static uint32_t ter_orig[4];
 
 void watch_prefetch_handler();

diff --git a/protossasm.S b/protossasm.S
@@ -1,4 +1,5 @@
 .arm
+.align 2
 .globl _trace_prefetch_handler
 _trace_prefetch_handler:
     ;# is this actually a breakpoint?