[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/wustl/apps/Agilla/opcodes OPclearvarM.nc, 1.3, 1.3.2.1 OPegetsetvar6M.nc, 1.3, 1.3.2.1 OPgetsetvar4M.nc, 1.4, 1.4.2.1 OPgetsetvarsM.nc, 1.4, 1.4.2.1 OPjumpM.nc, 1.3, 1.3.2.1 OPrjump5M.nc, 1.3, 1.3.2.1

[Chien-Liang Fok]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/opcodes
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26847/opcodes

Modified Files:
      Tag: GroupComm
	OPclearvarM.nc OPegetsetvar6M.nc OPgetsetvar4M.nc 
	OPgetsetvarsM.nc OPjumpM.nc OPrjump5M.nc 
Log Message:
Added a proxy heart beat and a virtual ID for the proxy.

Index: OPclearvarM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/opcodes/OPclearvarM.nc,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** OPclearvarM.nc	18 May 2006 19:58:41 -0000	1.3
--- OPclearvarM.nc	15 Nov 2006 04:29:34 -0000	1.3.2.1
***************
*** 141,145 ****
        {
          dbg(DBG_USR1, "VM (%i:%i): ERROR: Heap index %i out of range.\n", context->id.id, context->pc-1, arg.value.value);
!         call ErrorMgrI.error(context, AGILLA_ERROR_INDEX_OUT_OF_BOUNDS);
          return FAIL;    
        }
--- 141,145 ----
        {
          dbg(DBG_USR1, "VM (%i:%i): ERROR: Heap index %i out of range.\n", context->id.id, context->pc-1, arg.value.value);
!         call ErrorMgrI.error(context, AGILLA_ERROR_HEAP_INDEX_OUT_OF_BOUNDS);
          return FAIL;    
        }

Index: OPegetsetvar6M.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/opcodes/OPegetsetvar6M.nc,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** OPegetsetvar6M.nc	26 May 2006 02:58:20 -0000	1.3
--- OPegetsetvar6M.nc	15 Nov 2006 04:29:34 -0000	1.3.2.1
***************
*** 136,140 ****
      {
        dbg(DBG_USR1, "VM (%i:%i): ERROR: Heap Index out of range %i.\n", context->id.id, context->pc-1, arg);
!       call ErrorMgrI.error(context, AGILLA_ERROR_INDEX_OUT_OF_BOUNDS);
        return FAIL;    
      }
--- 136,140 ----
      {
        dbg(DBG_USR1, "VM (%i:%i): ERROR: Heap Index out of range %i.\n", context->id.id, context->pc-1, arg);
!       call ErrorMgrI.error(context, AGILLA_ERROR_HEAP_INDEX_OUT_OF_BOUNDS);
        return FAIL;    
      }

Index: OPgetsetvar4M.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/opcodes/OPgetsetvar4M.nc,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** OPgetsetvar4M.nc	26 May 2006 02:58:20 -0000	1.4
--- OPgetsetvar4M.nc	15 Nov 2006 04:29:34 -0000	1.4.2.1
***************
*** 134,138 ****
      {
        dbg(DBG_USR1, "VM (%i:%i): ERROR: Heap Index out of range %i.\n", context->id.id, context->pc-1, arg);
!       call ErrorMgrI.error(context, AGILLA_ERROR_INDEX_OUT_OF_BOUNDS);
        return FAIL;    
      }
--- 134,138 ----
      {
        dbg(DBG_USR1, "VM (%i:%i): ERROR: Heap Index out of range %i.\n", context->id.id, context->pc-1, arg);
!       call ErrorMgrI.error(context, AGILLA_ERROR_HEAP_INDEX_OUT_OF_BOUNDS);
        return FAIL;    
      }

Index: OPgetsetvarsM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/opcodes/OPgetsetvarsM.nc,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C2 -d -r1.4 -r1.4.2.1
*** OPgetsetvarsM.nc	18 May 2006 19:58:41 -0000	1.4
--- OPgetsetvarsM.nc	15 Nov 2006 04:29:34 -0000	1.4.2.1
***************
*** 70,74 ****
        if (addr.value.value >= AGILLA_HEAP_SIZE) {
          dbg(DBG_USR1, "VM (%i:%i): ERROR: Heap Index out of range %i.\n", context->id.id, context->pc-1, (int)addr.value.value);
!         call Error.error(context, AGILLA_ERROR_INDEX_OUT_OF_BOUNDS);
          return FAIL;    
        }   
--- 70,74 ----
        if (addr.value.value >= AGILLA_HEAP_SIZE) {
          dbg(DBG_USR1, "VM (%i:%i): ERROR: Heap Index out of range %i.\n", context->id.id, context->pc-1, (int)addr.value.value);
!         call Error.error(context, AGILLA_ERROR_HEAP_INDEX_OUT_OF_BOUNDS);
          return FAIL;    
        }   

Index: OPjumpM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/opcodes/OPjumpM.nc,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** OPjumpM.nc	18 May 2006 19:58:41 -0000	1.3
--- OPjumpM.nc	15 Nov 2006 04:29:34 -0000	1.3.2.1
***************
*** 172,176 ****
          return SUCCESS;
        } else {
!         call ErrorMgrI.error2d(context, AGILLA_ERROR_INDEX_OUT_OF_BOUNDS, arg.value.value, context->codeSize);
          return FAIL;
        }
--- 172,176 ----
          return SUCCESS;
        } else {
!         call ErrorMgrI.error2d(context, AGILLA_ERROR_CODE_INDEX_OUT_OF_BOUNDS, arg.value.value, context->codeSize);
          return FAIL;
        }

Index: OPrjump5M.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/wustl/apps/Agilla/opcodes/OPrjump5M.nc,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** OPrjump5M.nc	18 May 2006 19:58:41 -0000	1.3
--- OPrjump5M.nc	15 Nov 2006 04:29:34 -0000	1.3.2.1
***************
*** 171,175 ****
        return SUCCESS;
      } else {
!       call ErrorMgrI.error(context, AGILLA_ERROR_INDEX_OUT_OF_BOUNDS);
        return FAIL;        
      }    
--- 171,175 ----
        return SUCCESS;
      } else {
!       call ErrorMgrI.error(context, AGILLA_ERROR_CODE_INDEX_OUT_OF_BOUNDS);
        return FAIL;        
      }