3a_asm: using Expr in both stages

[calu.git] / 2_isa / src / bootrom.s

diff --git a/2_isa/src/bootrom.s b/2_isa/src/bootrom.s
index 98d6df34a22f0bfe7f9f15cb4ac3da0fc0897122..d60c31692f3e7e9818cc269159211ee35bfa3f21 100644 (file)
--- a/2_isa/src/bootrom.s
+++ b/2_isa/src/bootrom.s
@@ -1,12 +1,11 @@
        .data
 
        .text
-       ; TODO: will the assembler be able to evaluate these expressions?
        .define UART_BASE, 0x1000
-       .define UART_STATUS, (UART_BASE+0x4)
-       .define UART_RECV, (UART_BASE+0x8)
-       .define UART_TRANS, (UART_BASE+0xC)
-       .define UART_BAUD, (UART_BAUD+0x10)
+       .define UART_STATUS, UART_BASE+0x4
+       .define UART_RECV, UART_BASE+0x8
+       .define UART_TRANS, UART_BASE+0xC
+       .define UART_BAUD, UART_BASE+0x10
 
        .define UART_TRANS_EMPTY, 0
        .define UART_RECV_NEW, 1