Changeset 200 for Deliverables/D4.1/ASM.mli

Timestamp:

Oct 20, 2010, 1:35:59 PM (9 years ago)

Author:

mulligan

Message:

New features:

1) conditional jumps to labels implemented

[Note: all conditional jumps are to relative addresses;

if the label is too far away, an assert false is currently raised]

2) we now have a preamble of declarations of data labels in external

memory and a new pseudo-instruction "Mov" to place the value of a
data label into DPTR.

File:

• Deliverables/D4.1/ASM.mli (modified) (4 diffs)

Deliverables/D4.1/ASM.mli

@@ -25 +25 @@
 type addr16 = [ `ADDR16 of word ]
 
-type instruction =
+type 'addr jump =
+ [ `JC of 'addr
+ | `JNC of 'addr
+ | `JB of bit * 'addr
+ | `JNB of bit * 'addr
+ | `JBC of bit * 'addr
+ | `JZ of 'addr
+ | `JNZ of 'addr
+ | `CJNE of (acc * [ direct | data ], [ reg | indirect ] * data) union2 * 'addr
+ | `DJNZ of [ reg | direct ] * 'addr
+ ]
+
+type 'addr preinstruction =
  (* arithmetic operations *)
  [ `ADD of acc * [ reg | direct | indirect | data ]
@@ -75 +87 @@
 
  (* program branching *)
- | `JC of rel
- | `JNC of rel
- | `JB of bit * rel
- | `JNB of bit * rel
- | `JBC of bit * rel
+ | 'addr jump 
  | `ACALL of addr11
  | `LCALL of addr16
@@ -88 +96 @@
  | `SJMP of rel
  | `JMP of indirect_dptr
- | `JZ of rel
- | `JNZ of rel
- | `CJNE of (acc * [ direct | data ], [ reg | indirect ] * data) union2 * rel
- | `DJNZ of [ reg | direct ] * rel
  | `NOP ]
+
+type instruction = rel preinstruction
 
 type labelled_instruction =
@@ -100 +106 @@
  | `Jmp of string
  | `Call of string
+ | `Mov of dptr * string
+ | `WithLabel of [`Label of string] jump
  ]
+
+(* pairs <datalabel,size> *)
+type preamble = (string * int) list
+
+type assembly_program = preamble * labelled_instruction list;;