diff options
author | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-10 16:56:20 +0100 |
---|---|---|
committer | Alex AUVOLAT <alex.auvolat@ens.fr> | 2014-01-10 16:56:20 +0100 |
commit | 70a040d0c327ef1fa8fa73da70f245dedbf8bf2e (patch) | |
tree | c17ff1a97e7126194b5ba6081aeb353435d54cd3 /asm/asm.ml | |
parent | 6de7ebfc3fa320b639a292a174f213005d5ce2c2 (diff) | |
parent | b840059a7f2fb0e3796414f30f1e241d03b44dbf (diff) | |
download | SystDigit-Projet-70a040d0c327ef1fa8fa73da70f245dedbf8bf2e.tar.gz SystDigit-Projet-70a040d0c327ef1fa8fa73da70f245dedbf8bf2e.zip |
Merge branch 'emile'
Diffstat (limited to 'asm/asm.ml')
-rw-r--r-- | asm/asm.ml | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -58,6 +58,7 @@ type instr = | Lra of imm | Byte of int | Word of int + | Wlab of string | Hlt module Imap = Map.Make(String) |