decreased available ram size due to stack usage, working interrupt vectors

diff --git a/betty/lpc2220_rom.ld b/betty/lpc2220_rom.ld
index 92a99a059394cf5f3e2883a1fd591cf5de978e39..40ed2abfebe73715bd12d2ae1a9ba71491fa03f9 100644 (file)
--- a/betty/lpc2220_rom.ld
+++ b/betty/lpc2220_rom.ld
@@ -10,7 +10,7 @@
 MEMORY {
        FLASH_BANK0 (rx) : ORIGIN = 0x80000000, LENGTH = 0x00100000
        FLASH_BANK2 (rx) : ORIGIN = 0x82000000, LENGTH = 0x00100000
-       RAM (rw) : ORIGIN = 0x40000000, LENGTH = 0x00010000
+       RAM (rw) : ORIGIN = 0x40000000, LENGTH = 0x00010000 - (4 * 1024)
 }
 
 /* section definitions */

diff --git a/betty/startup.s b/betty/startup.s
index 7cf1e107b3c222dc9faf006a31bf28d801b62dc4..d6b0184641a3d02d4af553c485ad929a4f80e42e 100644 (file)
--- a/betty/startup.s
+++ b/betty/startup.s
@@ -50,18 +50,26 @@
 
        # exception handling must go to the very beginning
 
-       b handler_reset
-       b interrupt_handler_undef_instruction
-       b interrupt_handler_soft_ir
-       b interrupt_handler_prefetch_abort
-       b interrupt_handler_data_abort
+       ldr pc, handler_reset
+       ldr pc, handler_undef_instruction
+       ldr pc, handler_soft_ir
+       ldr pc, handler_prefetch_abort
+       ldr pc, handler_data_abort
        nop
-       b interrupt_handler_irq
-       b interrupt_handler_fiq
+       ldr pc, handler_irq
+       ldr pc, handler_fiq
+
+handler_reset: .word handle_reset
+handler_undef_instruction: .word interrupt_handler_undef_instruction
+handler_soft_ir: .word interrupt_handler_soft_ir
+handler_prefetch_abort: .word interrupt_handler_prefetch_abort
+handler_data_abort: .word interrupt_handler_data_abort
+handler_irq: .word interrupt_handler_irq
+handler_fiq: .word interrupt_handler_fiq
 
        # reset handling goes here
 
-handler_reset:
+handle_reset:
 
        # init stack pointer for each mode + set stack limit