This is the complement for the previous revision. This one should be running

Alain Prouté
1 parent 010ee26a
Showing 1 changed file with 18 additions and 28 deletions Show diff stats
anubis_dev/compiler/src/vminstr.c
@@ -343,15 +343,18 @@ int instruction_size(Expr instr, int offset)
       case load_int_big: /* (load_int_big 256-bigit ... 256-bigit) */
       case load_int_big_push: 
         {
+          /* This instruction stored as follows:   
+              instruction:          1 byte 
+              number of bigits:     4 bytes 
+              bigits:               4*(number of 2^32-bigits) bytes
+              ------------------------------------------------------------
+              total:            5 + 4*(number of 2^32-bigits) bytes
+              
+              The number of 2^32-bigits is 4 times the number of 256-bigits. 
+         */ 
           U32 n = length(cdr(instr));  /* number of 256-bigits */ 
           while (n&3) n++;    /* compute number of bytes in 2^32-bigits */ 
-          return 13 + n;      /* 1     instruction
-                                 1     number of alignment bytes before the number 
-                                 3     alignment bytes (total is always 3) 
-                                 4     counter (= 0, i.e. permanent datum)
-                                 4     number of 2^32-bigits 
-                                 n     number of bytes in 2^32-bigits 
-                   total:        13 + n */
+          return 5 + n;
         }
  
       case type_mixed_switch:
@@ -477,7 +480,7 @@ int instruction_size(Expr instr, int offset)
  
       /* system calls */ 
  
-#define sc_item(n,f)  case n:
+#define sc_item(n,a,f)  case n:
    syscall_list
 #undef sc_item
    return 1+2;        /* 'syscall' byte + index of function (2 bytes) */ 
@@ -1616,29 +1619,19 @@ void translate_instruction(U8 *code_addr,
       case load_int_big_push:
         {
           Expr aux; 
-          Expr bigits256 = cdr(instr); 
-          int n = length(bigits256); 
-          U32 dec; 
+          Expr bigits256 = cdr(instr);   // the bigits in basis 256
+          int n = length(bigits256);     // the number of bigits in basis 256s
  
           /* add nul bigits, so as to have a number of bigits (in basis 256) divisible by 4 */
           while (n&3) { n++; bigits256 = cons(new_integer(0),bigits256); }
  
-          /* the instruction */ 
+          /* put the instruction */ 
           *((*ptr)++) = car(instr) == load_int_big ? i_load_int_big : i_load_int_big_push; 
-          /* compute the number of alignment bytes */
-          dec = ((((U32)(*ptr))+1)&3) ? 4-((((U32)(*ptr))+1)&3) : 0; /* number of alignment bytes */
-          //dec = ((((U32)(*ptr)))&3) ? 4-((((U32)(*ptr)))&3) : 0; /* number of alignment bytes */
-          /* store the number of alignment bytes */ 
-          *((*ptr)++) = dec;            
-          /* write the alignment bytes */ 
-          for (i = 0; i < dec; i++) *((*ptr)++) = 0;   
-   
-          /* put the counter (aligned on 0 mod 4) */ 
-          *(((U32 *)(*ptr))) = 0; /* counter = 0 for permanent datum */ 
-          *ptr += sizeof(U32); 
-          /* and the number of bigits (in basis 2^32) */
+
+          /* put the number of bigits (in basis 2^32) */
           *(((U32 *)(*ptr))) = n>>2;      /* number of bigits (bytes/4) */ 
           *ptr += sizeof(U32); 
+          
           /* put the bigits (most significant first) */
           while(consp(bigits256))
             {
@@ -1647,9 +1640,6 @@ void translate_instruction(U8 *code_addr,
               *(((U32 *)(*ptr))) = word32_value(aux);   
               *ptr += sizeof(U32); 
             }
-   
-          /* write remaining alignement bytes (total is always 3) */ 
-          for (i = 0; i < 3 - dec; i++) *((*ptr)++) = 0;   /* write the alignment bytes */ 
         }
         break;    
  
@@ -1968,7 +1958,7 @@ void translate_instruction(U8 *code_addr,
         /* system calls */ 
  
  
-#define sc_item(n,f) case n: *module_flags |= f; \
+#define sc_item(n,a,f) case n: *module_flags |= f; \
        *((*ptr)++) = i_syscall; *(((U16 *)(*ptr))) = sc_##n;  *ptr += sizeof(U16); break; 
         syscall_list
 #undef sc_item