Changeset 121


Ignore:
Timestamp:
Sep 23, 2010, 3:57:19 PM (9 years ago)
Author:
mulligan
Message:

Fixed obscure type error in pretty.

Location:
Deliverables/D4.1
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • Deliverables/D4.1/ASMInterpret.ml

    r120 r121  
    22open Physical;;
    33open ASM;;
     4open Pretty;;
    45
    56exception Fetch_exception of string;;
     
    118119       `ACALL (`ADDR11 (mk_word11 a10 a9 a8 b1)), pc, 2
    119120   | (false,false,true,false),(true,r1,r2,r3) ->
    120       `ADD (`A,`REG (r1,r2,r3)), pc, 1
     121       `ADD (`A,`REG (r1,r2,r3)), pc, 1
    121122   | (false,false,true,false),(false,true,false,true) ->
    122123      let pc,b1 = next pc in
     
    141142       `AJMP (`ADDR11 (mk_word11 a10 a9 a8 b1)), pc, 2
    142143   | (false,true,false,true),(true,r1,r2,r3) ->
    143       `ANL (`U1 (`A, `REG (r1,r2,r3))), pc, 1
     144       `ANL (`U1 (`A, `REG (r1,r2,r3))), pc, 1
    144145   | (false,true,false,true),(false,true,false,true) ->
    145146      let pc,b1 = next pc in
  • Deliverables/D4.1/pretty.ml

    r98 r121  
    66    `Label l -> l ^ ":"
    77  | `Cost l -> l ^ ":"
     8  | `Jmp j -> "Jump: " ^ j
     9  | `Call j -> "Call: " ^ j
    810  | `ACALL (`ADDR11 w) ->
    911    "ACALL addr11 (" ^ string_of_vect w ^ ")"
     
    5557  | `CPL `A -> "CPL A"
    5658  | `CPL `C -> "CPL C"
    57   | `CPL `BIT b1 -> "CPL bit (" ^ string_of_vect b1 ^ ")"
     59  | `CPL (`BIT b1) -> "CPL bit (" ^ string_of_vect b1 ^ ")"
    5860  | `DA `A ->
    5961  "DA `A"
     
    222224  | `XRL(`U2(`DIRECT b1, `DATA b2)) ->
    223225  "XRL direct #data (" ^ string_of_vect b2 ^ ")"
     226  | _ -> "BUG: Unimplemented!"
  • Deliverables/D4.1/pretty.mli

    r98 r121  
    1 val pp_instruction: [< ASM.labelled_instruction] -> string
     1val pp_instruction: ASM.labelled_instruction -> string
Note: See TracChangeset for help on using the changeset viewer.