diff options
| author | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-08 18:31:56 +0100 |
|---|---|---|
| committer | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-08 18:31:56 +0100 |
| commit | e07508129a81605f77ee410ef4db104a96fc44bf (patch) | |
| tree | 670472f86292f07d8930d986727d5e9ce87ff1ad /asm/asmlex.mll | |
| parent | 1f228ce77e8a71475930b433fb2c72521203aa99 (diff) | |
| parent | 91bc6bd5554bb4267cbaf147e603791e50462242 (diff) | |
| download | SystDigit-Projet-e07508129a81605f77ee410ef4db104a96fc44bf.tar.gz SystDigit-Projet-e07508129a81605f77ee410ef4db104a96fc44bf.zip | |
Merge branch 'emile' into integration-progressive
Conflicts:
asm/_tags
asm/asmlex.mll
asm/asmpars.mly
asm/assembler.ml
Diffstat (limited to 'asm/asmlex.mll')
| -rw-r--r-- | asm/asmlex.mll | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/asm/asmlex.mll b/asm/asmlex.mll index 726b732..1c7e3e7 100644 --- a/asm/asmlex.mll +++ b/asm/asmlex.mll @@ -28,9 +28,12 @@ "move",MOVE; "jz",JZ; "jnz",JNZ; - "byte",BYTE; - "word",WORD; "asciiz",ASCIIZ; + "_clock",INT 0x4000; + "_input",INT 0x4100; + "_output",INT 0x4102; + "word",WORD; + "byte",BYTE ] let regs = [ |