summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex AUVOLAT <alex.auvolat@ens.fr>2014-01-09 15:53:04 +0100
committerAlex AUVOLAT <alex.auvolat@ens.fr>2014-01-09 15:53:04 +0100
commitf8c7333c7045ee9e4dae38933c29c6db12dd2501 (patch)
tree84fd855c7ee35169052817a23709be87dba94eda
parent8a3c8393b078084e8712641a2d2abdba728a0be1 (diff)
downloadSystDigit-Projet-f8c7333c7045ee9e4dae38933c29c6db12dd2501.tar.gz
SystDigit-Projet-f8c7333c7045ee9e4dae38933c29c6db12dd2501.zip
Use more elegant _clock and _output in test asm file.
-rw-r--r--asm/test.asm5
-rw-r--r--cpu/prog_test1.rom15
2 files changed, 10 insertions, 10 deletions
diff --git a/asm/test.asm b/asm/test.asm
index 4c3369f..5d58ff7 100644
--- a/asm/test.asm
+++ b/asm/test.asm
@@ -1,6 +1,6 @@
.text
init:
- liuz B 0x40
+ li B _clock
lw B 0(B)
jz B init
add D D B
@@ -11,8 +11,7 @@ init:
j init
ser_out_msg:
- liuz C 0x41
- lil C 0x02
+ li C _output
ser_out_msg_loop:
lb B 0(A)
jz B ser_out_msg_ret
diff --git a/cpu/prog_test1.rom b/cpu/prog_test1.rom
index 4c71fad..8156628 100644
--- a/cpu/prog_test1.rom
+++ b/cpu/prog_test1.rom
@@ -1,6 +1,7 @@
-54 8
+56 8
# init:
-00000010 01011011 # liuz B 64
+00000000 01010011 # lilz B 0
+00000010 01001011 # liu B 64
00000010 01000001 # lw B 0(B)
00000000 10110011 # lilz E init
00000000 10101011 # liu E init
@@ -8,18 +9,18 @@
00010001 00100000 # add D D B
01111111 11101100 # incri SP -2
00000111 00110001 # sw D 0(SP)
-00001100 10010011 # lilz A msgtick
+01001100 10010011 # lilz A msgtick
00000000 10001011 # liu A msgtick
00010000 00010010 # jal ser_out_msg
00000111 00100001 # lw D 0(SP)
01000000 11101100 # incri SP 2
-01100111 11100010 # j init
+00100111 11100010 # j init
# ser_out_msg:
-10000010 11011011 # liuz C 65
-01000000 11000011 # lil C 2
+01000000 11010011 # lilz C 2
+10000010 11001011 # liu C 65
# ser_out_msg_loop:
00000100 01001001 # lb B 0(A)
-01110100 10110011 # lilz E ser_out_msg_ret
+00001100 10110011 # lilz E ser_out_msg_ret
00000000 10101011 # liu E ser_out_msg_ret
01000010 10101010 # jer E B Z
00000110 01011001 # sb B 0(C)