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 /asm/asm.ml | |
| 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 'asm/asm.ml')
| -rw-r--r-- | asm/asm.ml | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -56,11 +56,13 @@ type instr = | Liu of (reg * imm) | Liuz of (reg * imm) | Lra of imm - | TwoRawBytes of (int * int) + | Byte of int + | Word of int + | Hlt module Imap = Map.Make(String) -type program = { text : instr list; data : (int * bool) list; +type program = { text : instr list; lbls : (int * bool) Imap.t } let keywords_r = [ @@ -96,3 +98,5 @@ let keywords_r = [ "swr",Swr; "sbr",Sbr ] + +exception Lexer_error |