[Tinyos-commits] CVS: tinyos-1.x/tos/lib/VM/languages/motlle/mate MemoryM.nc, 1.3, 1.4 Motlle.h, 1.3, 1.4 MotlleFrame.nc, 1.3, 1.4 MotlleObjectsM.nc, 1.5, 1.6 MotlleStack.nc, 1.3, 1.4 MotlleTypes.nc, 1.4, 1.5

[David Gay]

Update of /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/mate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv806

Modified Files:
	MemoryM.nc Motlle.h MotlleFrame.nc MotlleObjectsM.nc 
	MotlleStack.nc MotlleTypes.nc 
Log Message:
compile error fixes


Index: MemoryM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/mate/MemoryM.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MemoryM.nc	23 Oct 2005 21:09:24 -0000	1.3
--- MemoryM.nc	25 Oct 2005 16:54:08 -0000	1.4
***************
*** 88,92 ****
    }
  
!   MINLINE command MateOpcode HandlerStore.getOpcode[uint8_t id](uint16_t which) {
      // the test on gvars confirms that code has been installed
      if (!gvars)
--- 88,92 ----
    }
  
!   MINLINE command MateOpcode HandlerStore.getOpcode[uint8_t id](uint16_t pc) {
      // the test on gvars confirms that code has been installed
      if (!gvars)
***************
*** 98,103 ****
        case 0: return OP_MHANDLER4 + id;
        case 1: return OP_HALT;
!       case 2: return OP_FRAME;
!       default: return (call GC.base())[which];
        }
    }
--- 98,103 ----
        case 0: return OP_MHANDLER4 + id;
        case 1: return OP_HALT;
!       case 2: return OP_MFRAME;
!       default: return (call GC.base())[pc];
        }
    }
***************
*** 235,239 ****
    command result_t Frame.execute(uint8_t instr, MateContext *context) {
      void *vframe = call S.current_frame(context);
!     call MotlleFrame.execute[framekind(call S.fp(context))](context, vframe);
      return SUCCESS;
    }
--- 235,239 ----
    command result_t Frame.execute(uint8_t instr, MateContext *context) {
      void *vframe = call S.current_frame(context);
!     call MotlleFrame.execute[frame_kind(call S.fp(context))](context, vframe);
      return SUCCESS;
    }
***************
*** 282,291 ****
    }
  
!   MINLINE command mvalue S.getOtherFrame(void *sp, uint8_t idx) {
!     return call V.read((svalue *)sp + idx);
    }
  
!   MINLINE command void S.putOtherFrame(void *sp, uint8_t idx, mvalue x) {
!     return call V.write((svalue *)sp + idx, x);
    }
  
--- 282,291 ----
    }
  
!   MINLINE command mvalue S.getOtherFrame(void *osp, uint8_t idx) {
!     return call V.read((svalue *)osp + idx);
    }
  
!   MINLINE command void S.putOtherFrame(void *osp, uint8_t idx, mvalue x) {
!     return call V.write((svalue *)osp + idx, x);
    }
  
***************
*** 407,410 ****
--- 407,414 ----
    }
  
+   default command void MotlleFrame.execute[framekind k](MateContext *context, void *vframe) {
+     assert(0);
+   }
+ 
    uint8_t *scan(uint8_t *ptr) {
      void *data = call V.skip_header(ptr);

Index: Motlle.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/mate/Motlle.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Motlle.h	14 Oct 2005 00:21:39 -0000	1.3
--- Motlle.h	25 Oct 2005 16:54:08 -0000	1.4
***************
*** 124,127 ****
--- 124,128 ----
  enum {
    MOTLLE_INTERPRET_FRAME = unique("MotlleFrame"),
+   MOTLLE_MAP_FRAME = unique("MotlleFrame"),
    /* MOTLLE_STACK_ALIGNMENT must be aligned enough for the svalue and all
       stack frame types. */

Index: MotlleFrame.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/mate/MotlleFrame.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MotlleFrame.nc	23 Oct 2005 21:09:24 -0000	1.3
--- MotlleFrame.nc	25 Oct 2005 16:54:08 -0000	1.4
***************
*** 3,7 ****
  interface MotlleFrame
  {
!   command void execute(MateContext *context);
    command msize gc_forward(MateContext *context, void *vframe, uint8_t *lfp, uint8_t *lsp);
  }
--- 3,7 ----
  interface MotlleFrame
  {
!   command void execute(MateContext *context, void *vframe);
    command msize gc_forward(MateContext *context, void *vframe, uint8_t *lfp, uint8_t *lsp);
  }

Index: MotlleObjectsM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/mate/MotlleObjectsM.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MotlleObjectsM.nc	23 Oct 2005 22:11:05 -0000	1.5
--- MotlleObjectsM.nc	25 Oct 2005 16:54:08 -0000	1.6
***************
*** 308,312 ****
      for (scan = l;; scan = call V.read(&(call T.pair(l))->cdr))
        {
! 	if (call T.nilp(scan))
  	  break;
  	if (!call T.pairp(scan) || call V.marked(scan))
--- 308,312 ----
      for (scan = l;; scan = call V.read(&(call T.pair(l))->cdr))
        {
! 	if (call T.nullp(scan))
  	  break;
  	if (!call T.pairp(scan) || call V.marked(scan))
***************
*** 319,323 ****
      for (scan = l;; scan = call V.read(&(call T.pair(l))->cdr))
        {
! 	if (call T.nilp(scan) || !call V.marked(scan))
  	  return ok;
  	call V.unmark(scan);
--- 319,323 ----
      for (scan = l;; scan = call V.read(&(call T.pair(l))->cdr))
        {
! 	if (call T.nullp(scan) || !call V.marked(scan))
  	  return ok;
  	call V.unmark(scan);

Index: MotlleStack.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/mate/MotlleStack.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MotlleStack.nc	23 Oct 2005 21:09:24 -0000	1.3
--- MotlleStack.nc	25 Oct 2005 16:54:08 -0000	1.4
***************
*** 19,23 ****
    command mvalue get(MateContext *context, uint8_t sindex);
  
!   command mvalue getOtherFrame(void *sp, uint8_t sindex);
!   command void putOtherFrame(void *sp, uint8_t sindex, mvalue v);
  }
--- 19,23 ----
    command mvalue get(MateContext *context, uint8_t sindex);
  
!   command mvalue getOtherFrame(void *osp, uint8_t sindex);
!   command void putOtherFrame(void *osp, uint8_t sindex, mvalue v);
  }

Index: MotlleTypes.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/mate/MotlleTypes.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MotlleTypes.nc	23 Oct 2005 21:09:24 -0000	1.4
--- MotlleTypes.nc	25 Oct 2005 16:54:08 -0000	1.5
***************
*** 64,68 ****
    /* Returns: number x (int or real) as a real */
  
!   command bool valid_list(MateContext *context, mvalue l, msize *len);
  
  }
--- 64,68 ----
    /* Returns: number x (int or real) as a real */
  
!   command bool valid_list(mvalue l, msize *len);
  
  }