-

Alain Prouté
1 parent 56ee3cb4
Showing 1 changed file with 57 additions and 58 deletions Show diff stats
anubis_dev/library/a2a/generic/preformater.anubis
@@ -78,11 +78,10 @@ type GeoParms:
  
    Default values for 32 and 64 bits machines:     
  
-define GeoParms     default_32_geoparms  =  geoparms(8,32,32,4,30,128). 
-define GeoParms     default_64_geoparms  =  geoparms(8,64,64,8,48,256). 
+define GeoParms     default_32_geoparms  =  geoparms((Int)8,(Int)32,(Int)32,(Int)4,(Int)1,(Int)30,(Int)128). 
+define GeoParms     default_64_geoparms  =  geoparms((Int)8,(Int)64,(Int)64,(Int)8,(Int)1,(Int)48,(Int)256). 
  
  
-       
    *** [] General principles
  
    Data are represented either 'directly' or 'indirectly'. 'Directly'
@@ -258,7 +257,7 @@ define Int
      AnubisType   type
    ) =
    if tb is tbox(allt,alld,parms) then
-   if parms is geoparms(samu,wrdw,ptrw,algu,aptrw,ithh) then  
+   if parms is geoparms(samu,wrdw,ptrw,halu,salu,aptw,ithh) then  
    if type is 
    {
      parameter(name)             then should_not_happen(0),  
@@ -323,65 +322,65 @@ type Implementation:
  
    *** [] High level instructions
  
-public type HLInstr:
-
-  /* allocate a segment of a given size (in bits) and push the pointer on top of stack */
-  alloc_push (Int     width),
-  
-  /* push a constant on top of stack */ 
-  push_cst   (Int     width,            // width of datum (the width of stack slot will be computed from it)     
-              Int     value),           // value to be pushed
-           
-  /* pop a value from top of stack and glue it into the glue register */
-  pop_glue   (Int     width,            // width of value 
-              Int     disp),            // displacement in glue register 
-           
-  /* push the content of the glue register on top of stack */
-  push_glue  (Int     width),           // width of datum to be pushed
-           
-  mov        (Int     src_address,
-              Int     dst_address,
-              Int     width).    
  
+public type StackPos:
+   /* Type and position of a datum in the stack */
+   stk          (AnubisType   type,
+                 Int          depth),          // datum directly in the stack at depth 'depth' 
+   mctxt        (AnubisType   type,
+                 Int          stack_depth,     // datum in a micro-context at depth 'stack_depth' in the stack
+                 Int          offset).         // and at offset 'offset' in the micro-context
  
-   *** [] Generating constructors
+   
+   
+public type HLInstr:
+  /* label (pseudo-instruction) */ 
+  label         (Int          name), 
  
+  /* make a virtual copy */ 
+  copy          (StackPos     pos), 
  
-define List(HLInstr)
-  make_small_glue
-  (
-    Int                iw, 
-    List(CompImplem)   comps
-  ) =
-  if comps is 
-  {
-    [ ] then [ ], 
-    [c1 . others] then if c1 is comp(off,cw,impl) then 
-      [ glue()
-        
-      ]
-  }. 
+  /* make a virtual deletion */         
+  delete        (StackPos     pos), 
  
+  /* move a datum (no copy; if a copy is needed, it must be performed before the move) */
+  move          (StackPos     source, 
+                 StackPos     destination),  
  
-define List(HLInstr)
-   constructor
-   (
-     TypeImplem  implem, 
-     Int         index
-   ) = 
-   if implem is sum(tw,alts)
-   if alt is 
-   {
-     small(iw,i,n,comps)  then 
-       [
-         push_cst(tw,i) 
-         . make_small_glue(iw,comps)
-       ], 
-         
-     mixed(iw,i,n,comps)  then [],  
-     large(iw,i,n,comps)  then []
-   }. 
- 
-   
+  /* get the alternative index of the datum on top of stack (and put it in the index register) */ 
+  index         (AnubisType   type), 
+
+  /* switch (jmp to the label whose rank is in the index register) */
+  switch        (List(Int)    labels), 
  
+  /* compact (compact data on the stack (via the glue register)) */ 
+  compact       (AnubisAlternative   alt), 
+
+  /* extract (extract a datum from a compacted representation and push it on the stack) */
+  extract       (AnubisAlternative   alt, 
+                 Int                 component_rank), 
+                 
+  /* address (push a label on the stack; this may be a return address) */ 
+  address       (Int          label_name), 
+  
+  /* closure (construct a multiclosure and push it on the stack) */
+  closure       (List(Int)        code_labels,   // codes of functions 
+                 Int              gc_label,      // deletion code of closure
+                 List(StackPos)   micro_data),   // data to be put into the micro-context (no copy; 
+                                                 //   virtual copies must have been performed before 
+                                                 //   this instruction is executed)
+                 
+  /* apply a function to its argument (everything is on the stack) */
+  apply         (AnubisType       arg_type),     // type of argument
+  
+  /* return from a call */  
+  ret, 
+  
+  /* unreachable (control should never reach this point) */
+  unreachable.
+  
+   
+   
+   
+   *** [] Generating constructors