Ignore:
Timestamp:
Sep 7, 2011, 12:10:27 PM (8 years ago)
Author:
campbell
Message:

Merge trunk to branch.

Location:
Deliverables/D3.3/id-lookup-branch
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • Deliverables/D3.3/id-lookup-branch

  • Deliverables/D3.3/id-lookup-branch/LIN/LIN.ma

    r878 r1197  
    1 include "LIN/JointLTLLIN.ma".
    2  
    3 definition pre_lin_statement ≝ joint_statement unit.
     1include "joint/Joint.ma".
     2
     3definition lin_params: params ≝
     4 mk_params
     5   unit unit unit unit registers_move Register
     6     unit unit unit unit.
     7
     8definition pre_lin_statement ≝
     9 λglobals: list ident. joint_statement lin_params globals.
    410
    511definition lin_statement ≝
  • Deliverables/D3.3/id-lookup-branch/LIN/LINToASM.ma

    r1153 r1197  
    3535      match instr' with
    3636      [ joint_instr_cost_label lbl ⇒ set_insert ? (word_of_identifier ? lbl) (set_empty ?)
    37       | joint_instr_cond_acc lbl ⇒ set_insert ? (word_of_identifier ? lbl) (set_empty ?)
     37      | joint_instr_cond acc_a_reg lbl ⇒ set_insert ? (word_of_identifier ? lbl) (set_empty ?)
    3838      | _ ⇒ set_empty ?
    3939      ]
    4040    | joint_st_return ⇒ set_empty ?
    4141    | joint_st_goto lbl ⇒ set_insert ? (word_of_identifier ? lbl) (set_empty ?)
     42    | joint_st_extension _ ⇒ set_empty ?
    4243    ]
    4344  in
     
    9091  match statement with
    9192  [ joint_st_goto lbl ⇒ Jmp (word_of_identifier ? lbl)
     93  | joint_st_extension ext ⇒ Instruction (NOP ?) (* XXX: NOP or something else? *)
    9294  | joint_st_return ⇒ Instruction (RET ?)
    9395  | joint_st_sequential instr _ ⇒
Note: See TracChangeset for help on using the changeset viewer.