diff options
| author | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-09 15:50:45 +0100 |
|---|---|---|
| committer | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-09 15:50:45 +0100 |
| commit | 8a3c8393b078084e8712641a2d2abdba728a0be1 (patch) | |
| tree | 9704660c4ce756467996a0d2b048a742aa0b6736 /cpu | |
| parent | b8df2847aa60728b72a9a48769c8662214ba30c8 (diff) | |
| parent | 9495dd3a9e4aa9e27004ce9718ac39c197db13c0 (diff) | |
| download | SystDigit-Projet-8a3c8393b078084e8712641a2d2abdba728a0be1.tar.gz SystDigit-Projet-8a3c8393b078084e8712641a2d2abdba728a0be1.zip | |
Merge branch 'emile'
Conflicts:
asm/asm.ml
asm/asmlex.mll
asm/asmpars.mly
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/prog_test1.rom | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/cpu/prog_test1.rom b/cpu/prog_test1.rom index c6db00e..4c71fad 100644 --- a/cpu/prog_test1.rom +++ b/cpu/prog_test1.rom @@ -28,7 +28,15 @@ # ser_out_msg_ret: 00000000 01101010 # jr RA # msgtick: -00101010 10010110 # bytes 84 105 -11000110 11010110 # bytes 99 107 -10000100 00000000 # bytes 33 0 +00101010 + # msgtick: +10010110 + # msgtick: +11000110 + # msgtick: +11010110 + # msgtick: +10000100 + # msgtick: +00000000 |