Ignore:
Timestamp:
Jul 28, 2011, 12:14:17 PM (9 years ago)
Author:
campbell
Message:

Merge trunk into id-lookup-branch

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

Legend:

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

    • Property svn:mergeinfo set to
      /srcmergedeligible
  • Deliverables/D3.3/id-lookup-branch/LIN/JointLTLLIN.ma

    r1082 r1091  
    22include "ASM/I8051.ma".
    33include "common/CostLabel.ma".
     4include "common/Graphs.ma".
    45include "common/AST.ma".
    56include "common/Registers.ma".
    67
    78inductive joint_instruction (globals: list ident): Type[0] ≝
     9  | joint_instr_skip: joint_instruction globals
    810  | joint_instr_comment: String → joint_instruction globals
    911  | joint_instr_cost_label: costlabel → joint_instruction globals
     
    1820  | joint_instr_op2: Op2 → Register → joint_instruction globals
    1921  | joint_instr_clear_carry: joint_instruction globals
     22  | joint_instr_set_carry: joint_instruction globals
    2023  | joint_instr_load: joint_instruction globals
    2124  | joint_instr_store: joint_instruction globals
    22   | joint_instr_call_id: ident → joint_instruction globals
    23   | joint_instr_cond_acc: ident → joint_instruction globals.
     25  | joint_instr_call_id: label → joint_instruction globals
     26  | joint_instr_cond_acc: label → joint_instruction globals.
    2427
    2528inductive joint_statement (A: Type[0]) (globals: list ident): Type[0] ≝
    2629  | joint_st_sequential: joint_instruction globals → A → joint_statement A globals
    27   | joint_st_goto: ident → joint_statement A globals
    2830  | joint_st_return: joint_statement A globals.
Note: See TracChangeset for help on using the changeset viewer.