[Tinyos-commits] CVS: tinyos-1.x/tos/lib/VM/languages/motlle/src mate-interface.mt, 1.5, 1.6 vmconf.mt, 1.4, 1.5

[David Gay]

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

Modified Files:
	mate-interface.mt vmconf.mt 
Log Message:
opmb[ft]p3


Index: mate-interface.mt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/src/mate-interface.mt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** mate-interface.mt	17 Nov 2005 22:38:57 -0000	1.5
--- mate-interface.mt	22 Nov 2005 23:25:22 -0000	1.6
***************
*** 127,131 ****
      {
        any compile_errors = make_string_oport();
!       any olderr = set_stderr!(compile_errors);
        any olddisp = set_display_error!(display_error);
        any compiled = false;
--- 127,131 ----
      {
        any compile_errors = make_string_oport();
!       //any olderr = set_stderr!(compile_errors);
        any olddisp = set_display_error!(display_error);
        any compiled = false;
***************
*** 135,139 ****
  
        set_display_error!(olddisp);
!       set_stderr!(olderr);
  
        if (compiled)
--- 135,139 ----
  
        set_display_error!(olddisp);
!       //set_stderr!(olderr);
  
        if (compiled)

Index: vmconf.mt
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/src/vmconf.mt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** vmconf.mt	1 Nov 2005 02:28:11 -0000	1.4
--- vmconf.mt	22 Nov 2005 23:25:22 -0000	1.5
***************
*** 8,12 ****
   * 94704.  Attention:  Intel License Inquiry.
   */
! any rbytecode_mwritec, rbytecode_mwriteg, rbytecode_mwritel, rbytecode_mwritel3, rbytecode_mwritedc, rbytecode_mwritedg, rbytecode_mwritedl, rbytecode_mwritedl3, rbytecode_mclearl, rbytecode_mreadc, rbytecode_mreadg, rbytecode_mreadl, rbytecode_mreadc3, rbytecode_mreadl3, rbytecode_mset, rbytecode_mref, rbytecode_mexec4, rbytecode_mexecg4, rbytecode_mexecprim6, rbytecode_mclosure, rbytecode_mreturn, rbytecode_halt, rbytecode_mhandler4, rbytecode_mba3, rbytecode_mbf3, rbytecode_mbt3, rbytecode_mscheck4, rbytecode_mvcheck4, rbytecode_mcst, rbytecode_mint3, rbytecode_mundefined, rbytecode_mpop, rbytecode_mexitn, rbytecode_mbitxor, rbytecode_mbitor, rbytecode_mbitnot, rbytecode_mbitand, rbytecode_mshiftright, rbytecode_mshiftleft, rbytecode_mnegate, rbytecode_madd, rbytecode_msub, rbytecode_mmultiply, rbytecode_mdivide, rbytecode_mremainder, rbytecode_meq, rbytecode_mne, rbytecode_mlt, rbytecode_mle, rbytecode_mgt, rbytecode_mge, rbytecode_mnot;
  
  any set_bytecodes!(gstate)
--- 8,12 ----
   * 94704.  Attention:  Intel License Inquiry.
   */
! any rbytecode_mwritec, rbytecode_mwriteg, rbytecode_mwritel, rbytecode_mwritel3, rbytecode_mwritedc, rbytecode_mwritedg, rbytecode_mwritedl, rbytecode_mwritedl3, rbytecode_mclearl, rbytecode_mreadc, rbytecode_mreadg, rbytecode_mreadl, rbytecode_mreadc3, rbytecode_mreadl3, rbytecode_mset, rbytecode_mref, rbytecode_mexec4, rbytecode_mexecg4, rbytecode_mexecprim6, rbytecode_mclosure, rbytecode_mreturn, rbytecode_halt, rbytecode_mhandler, rbytecode_mba3, rbytecode_mbf3, rbytecode_mbt3, rbytecode_mbfp3, rbytecode_mbtp3, rbytecode_mscheck4, rbytecode_mvcheck4, rbytecode_mcst, rbytecode_mint3, rbytecode_mundefined, rbytecode_mpop, rbytecode_mexitn, rbytecode_mbitxor, rbytecode_mbitor, rbytecode_mbitnot, rbytecode_mbitand, rbytecode_mshiftright, rbytecode_mshiftleft, rbytecode_mnegate, rbytecode_madd, rbytecode_msub, rbytecode_mmultiply, rbytecode_mdivide, rbytecode_mremainder, rbytecode_meq, rbytecode_mne, rbytecode_mlt, rbytecode_mle, rbytecode_mgt, rbytecode_mge, rbytecode_mnot;
  
  any set_bytecodes!(gstate)
***************
*** 45,53 ****
    bytecodemap[bytecode_OPmreturn] = rbytecode_mreturn;
    bytecodemap[bytecode_OPhalt] = rbytecode_halt;
!   nbit(bytecode_OPmhandler4, rbytecode_mhandler4, 4);
  
    nbit(bytecode_OPmba3, rbytecode_mba3, 3);
    nbit(bytecode_OPmbf3, rbytecode_mbf3, 3);
    nbit(bytecode_OPmbt3, rbytecode_mbt3, 3);
  
    nbit(bytecode_OPmscheck4, rbytecode_mscheck4, 4);
--- 45,59 ----
    bytecodemap[bytecode_OPmreturn] = rbytecode_mreturn;
    bytecodemap[bytecode_OPhalt] = rbytecode_halt;
!   bytecodemap[bytecode_OPmhandler] = rbytecode_mhandler;
  
    nbit(bytecode_OPmba3, rbytecode_mba3, 3);
    nbit(bytecode_OPmbf3, rbytecode_mbf3, 3);
    nbit(bytecode_OPmbt3, rbytecode_mbt3, 3);
+   if (!null?(rbytecode_mbfp3))
+     {
+       // motlle vms don't have mb[ft]p3
+       nbit(bytecode_OPmbfp3, rbytecode_mbfp3, 3);
+       nbit(bytecode_OPmbtp3, rbytecode_mbtp3, 3);
+     }
  
    nbit(bytecode_OPmscheck4, rbytecode_mscheck4, 4);