[Tinyos-commits] CVS: tinyos-1.x/tos/lib/VM/languages/motlle/matelib .cvsignore, 1.1, 1.2 FNaggavgM.nc, 1.2, 1.3 FNaggmaxM.nc, 1.2, 1.3 FNaggminM.nc, 1.2, 1.3 FNmhopM.nc, 1.3, 1.4 FNqueryM.nc, 1.2, 1.3 FNrecvM.nc, 1.2, 1.3 Makefile, 1.2, 1.3

David Gay idgay at users.sourceforge.net
Tue Oct 25 15:33:23 PDT 2005 

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

Modified Files:
	.cvsignore FNaggavgM.nc FNaggmaxM.nc FNaggminM.nc FNmhopM.nc 
	FNqueryM.nc FNrecvM.nc Makefile 
Log Message:
-s option to mload to specify scheme code


Index: .cvsignore
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/matelib/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .cvsignore	19 May 2005 17:41:37 -0000	1.1
--- .cvsignore	25 Oct 2005 22:33:21 -0000	1.2
***************
*** 1 ****
--- 1,2 ----
  gen
+ sgen

Index: FNaggavgM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/matelib/FNaggavgM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FNaggavgM.nc	30 Nov 2004 18:52:43 -0000	1.2
--- FNaggavgM.nc	25 Oct 2005 22:33:21 -0000	1.3
***************
*** 22,26 ****
    };
  
!   //FN avg_make: -> v.
    command result_t AvgMake.execute(uint8_t instr, MateContext* context) {
      vvector state;
--- 22,26 ----
    };
  
!   //FN avg-make: -> v.
    command result_t AvgMake.execute(uint8_t instr, MateContext* context) {
      vvector state;
***************
*** 69,73 ****
    }
  
!   //FN avg_newepoch: sstate -> .
    command result_t AvgEpochUpdate.execute(uint8_t instr, MateContext* context) {
      mvalue v = call S.pop(context, 1);
--- 69,73 ----
    }
  
!   //FN avg-newepoch: sstate -> .
    command result_t AvgEpochUpdate.execute(uint8_t instr, MateContext* context) {
      mvalue v = call S.pop(context, 1);
***************
*** 172,176 ****
    }
  
!   //FN avg_buffer: -> s.
    command result_t AvgBuffer.execute(uint8_t instr, MateContext* context) {
      vstring buffer;
--- 172,176 ----
    }
  
!   //FN avg-buffer: -> s.
    command result_t AvgBuffer.execute(uint8_t instr, MateContext* context) {
      vstring buffer;
***************
*** 188,192 ****
    }
  
!   //FN avg_intercept: sstate s -> .
    command result_t AvgIntercept.execute(uint8_t instr, MateContext* context) {
      mvalue data = call S.pop(context, 1);
--- 188,192 ----
    }
  
!   //FN avg-intercept: sstate s -> .
    command result_t AvgIntercept.execute(uint8_t instr, MateContext* context) {
      mvalue data = call S.pop(context, 1);
***************
*** 205,209 ****
    }
  
!   //FN avg_update: sstate n -> .
    command result_t AvgSample.execute(uint8_t instr, MateContext* context) {
      mvalue data = call S.pop(context, 1);
--- 205,209 ----
    }
  
!   //FN avg-update: sstate n -> .
    command result_t AvgSample.execute(uint8_t instr, MateContext* context) {
      mvalue data = call S.pop(context, 1);
***************
*** 224,228 ****
    }
  
!   //FN avg_get: sstate -> s.
    command result_t AvgGet.execute(uint8_t instr, MateContext* context) {
      mvalue v = call S.pop(context, 1);
--- 224,228 ----
    }
  
!   //FN avg-get: sstate -> s.
    command result_t AvgGet.execute(uint8_t instr, MateContext* context) {
      mvalue v = call S.pop(context, 1);

Index: FNaggmaxM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/matelib/FNaggmaxM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FNaggmaxM.nc	30 Nov 2004 18:52:43 -0000	1.2
--- FNaggmaxM.nc	25 Oct 2005 22:33:21 -0000	1.3
***************
*** 23,27 ****
    };
  
!   //FN max_make: -> v.
    command result_t MaxMake.execute(uint8_t instr, MateContext* context) {
      vvector state;
--- 23,27 ----
    };
  
!   //FN max-make: -> v.
    command result_t MaxMake.execute(uint8_t instr, MateContext* context) {
      vvector state;
***************
*** 65,69 ****
    }
  
!   //FN max_newepoch: sstate -> .
    command result_t MaxEpochUpdate.execute(uint8_t instr, MateContext* context) {
      mvalue v = call S.pop(context, 1);
--- 65,69 ----
    }
  
!   //FN max-newepoch: sstate -> .
    command result_t MaxEpochUpdate.execute(uint8_t instr, MateContext* context) {
      mvalue v = call S.pop(context, 1);
***************
*** 161,165 ****
    }
  
!   //FN max_buffer: -> s.
    command result_t MaxBuffer.execute(uint8_t instr, MateContext* context) {
      vstring buffer;
--- 161,165 ----
    }
  
!   //FN max-buffer: -> s.
    command result_t MaxBuffer.execute(uint8_t instr, MateContext* context) {
      vstring buffer;
***************
*** 177,181 ****
    }
  
!   //FN max_intercept: sstate s -> .
    command result_t MaxIntercept.execute(uint8_t instr, MateContext* context) {
      mvalue data = call S.pop(context, 1);
--- 177,181 ----
    }
  
!   //FN max-intercept: sstate s -> .
    command result_t MaxIntercept.execute(uint8_t instr, MateContext* context) {
      mvalue data = call S.pop(context, 1);
***************
*** 194,198 ****
    }
  
!   //FN max_update: sstate n -> .
    command result_t MaxSample.execute(uint8_t instr, MateContext* context) {
      mvalue data = call S.pop(context, 1);
--- 194,198 ----
    }
  
!   //FN max-update: sstate n -> .
    command result_t MaxSample.execute(uint8_t instr, MateContext* context) {
      mvalue data = call S.pop(context, 1);
***************
*** 213,217 ****
    }
  
!   //FN max_get: sstate -> s.
    command result_t MaxGet.execute(uint8_t instr, MateContext* context) {
      mvalue v = call S.pop(context, 1);
--- 213,217 ----
    }
  
!   //FN max-get: sstate -> s.
    command result_t MaxGet.execute(uint8_t instr, MateContext* context) {
      mvalue v = call S.pop(context, 1);

Index: FNaggminM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/matelib/FNaggminM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FNaggminM.nc	30 Nov 2004 18:52:43 -0000	1.2
--- FNaggminM.nc	25 Oct 2005 22:33:21 -0000	1.3
***************
*** 23,27 ****
    };
  
!   //FN min_make: -> v.
    command result_t MinMake.execute(uint8_t instr, MateContext* context) {
      vvector state;
--- 23,27 ----
    };
  
!   //FN min-make: -> v.
    command result_t MinMake.execute(uint8_t instr, MateContext* context) {
      vvector state;
***************
*** 65,69 ****
    }
  
!   //FN min_newepoch: sstate -> .
    command result_t MinEpochUpdate.execute(uint8_t instr, MateContext* context) {
      mvalue v = call S.pop(context, 1);
--- 65,69 ----
    }
  
!   //FN min-newepoch: sstate -> .
    command result_t MinEpochUpdate.execute(uint8_t instr, MateContext* context) {
      mvalue v = call S.pop(context, 1);
***************
*** 161,165 ****
    }
  
!   //FN min_buffer: -> s.
    command result_t MinBuffer.execute(uint8_t instr, MateContext* context) {
      vstring buffer;
--- 161,165 ----
    }
  
!   //FN min-buffer: -> s.
    command result_t MinBuffer.execute(uint8_t instr, MateContext* context) {
      vstring buffer;
***************
*** 177,181 ****
    }
  
!   //FN min_intercept: sstate s -> .
    command result_t MinIntercept.execute(uint8_t instr, MateContext* context) {
      mvalue data = call S.pop(context, 1);
--- 177,181 ----
    }
  
!   //FN min-intercept: sstate s -> .
    command result_t MinIntercept.execute(uint8_t instr, MateContext* context) {
      mvalue data = call S.pop(context, 1);
***************
*** 194,198 ****
    }
  
!   //FN min_update: sstate n -> .
    command result_t MinSample.execute(uint8_t instr, MateContext* context) {
      mvalue data = call S.pop(context, 1);
--- 194,198 ----
    }
  
!   //FN min-update: sstate n -> .
    command result_t MinSample.execute(uint8_t instr, MateContext* context) {
      mvalue data = call S.pop(context, 1);
***************
*** 213,217 ****
    }
  
!   //FN min_get: sstate -> s.
    command result_t MinGet.execute(uint8_t instr, MateContext* context) {
      mvalue v = call S.pop(context, 1);
--- 213,217 ----
    }
  
!   //FN min-get: sstate -> s.
    command result_t MinGet.execute(uint8_t instr, MateContext* context) {
      mvalue v = call S.pop(context, 1);

Index: FNmhopM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/matelib/FNmhopM.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FNmhopM.nc	11 Jan 2005 22:38:21 -0000	1.3
--- FNmhopM.nc	25 Oct 2005 22:33:21 -0000	1.4
***************
*** 129,133 ****
    }
  
!   //FN intercept_msg: -> s. Return intercepted multihop message
    command result_t InterceptMsg.execute(uint8_t instr, MateContext* context) {
      if (context != &intercept.context)
--- 129,133 ----
    }
  
!   //FN intercept-msg: -> s. Return intercepted multihop message
    command result_t InterceptMsg.execute(uint8_t instr, MateContext* context) {
      if (context != &intercept.context)
***************
*** 142,146 ****
    }
  
!   //FN snoop_msg: -> s. Return snooped multihop message
    command result_t SnoopMsg.execute(uint8_t instr, MateContext* context) {
      if (context != &snoop.context)
--- 142,146 ----
    }
  
!   //FN snoop-msg: -> s. Return snooped multihop message
    command result_t SnoopMsg.execute(uint8_t instr, MateContext* context) {
      if (context != &snoop.context)
***************
*** 175,179 ****
    }
  
!   //FN mhop_set_update: i -> . Set the multihop update interval to i s
    command result_t MhopSetUpdate.execute(uint8_t instr, MateContext* context) {
      mvalue x = call S.pop(context, 1);
--- 175,179 ----
    }
  
!   //FN mhop-set-update: i -> . Set the multihop update interval to i s
    command result_t MhopSetUpdate.execute(uint8_t instr, MateContext* context) {
      mvalue x = call S.pop(context, 1);
***************
*** 197,201 ****
    }
  
!   //FN mhop_set_forwarding: b -> . Turn automatic forwarding on/off
    command result_t MhopSetForwarding.execute(uint8_t instr, MateContext* context) {
      mvalue x = call S.pop(context, 1);
--- 197,201 ----
    }
  
!   //FN mhop-set-forwarding: b -> . Turn automatic forwarding on/off
    command result_t MhopSetForwarding.execute(uint8_t instr, MateContext* context) {
      mvalue x = call S.pop(context, 1);

Index: FNqueryM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/matelib/FNqueryM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FNqueryM.nc	30 Nov 2004 18:52:43 -0000	1.2
--- FNqueryM.nc	25 Oct 2005 22:33:21 -0000	1.3
***************
*** 35,39 ****
    }
  
!   //FN next_epoch: -> i. Advances and returns epoch.
    command result_t NextEpoch.execute(uint8_t instr, MateContext* context) {
      if (!suppress)
--- 35,39 ----
    }
  
!   //FN next-epoch: -> i. Advances and returns epoch.
    command result_t NextEpoch.execute(uint8_t instr, MateContext* context) {
      if (!suppress)
***************
*** 49,53 ****
    }
  
!   //FN snoop_epoch: i -> . Heard message about epoch i. See if we should
    //  update epoch.
    command result_t SnoopEpoch.execute(uint8_t instr, MateContext* context) {
--- 49,53 ----
    }
  
!   //FN snoop-epoch: i -> . Heard message about epoch i. See if we should
    //  update epoch.
    command result_t SnoopEpoch.execute(uint8_t instr, MateContext* context) {

Index: FNrecvM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/matelib/FNrecvM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FNrecvM.nc	30 Nov 2004 18:52:43 -0000	1.2
--- FNrecvM.nc	25 Oct 2005 22:33:21 -0000	1.3
***************
*** 81,85 ****
    }
  
!   //FN received_msg: -> s. Return received message
    command result_t ReceivedMsg.execute(uint8_t instr, MateContext* context) {
      if (context != &receive.context)
--- 81,85 ----
    }
  
!   //FN received-msg: -> s. Return received message
    command result_t ReceivedMsg.execute(uint8_t instr, MateContext* context) {
      if (context != &receive.context)

Index: Makefile
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/tos/lib/VM/languages/motlle/matelib/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile	30 Nov 2004 18:52:43 -0000	1.2
--- Makefile	25 Oct 2005 22:33:21 -0000	1.3
***************
*** 3,7 ****
  QUERYFN = FNqueryM.nc FNaggavgM.nc FNaggmaxM.nc FNaggminM.nc
  
! all: gen/commfns.vmsf gen/mhopfns.vmsf gen/queryfns.vmsf
  
  gen/commfns.vmsf: $(COMMFN)
--- 3,8 ----
  QUERYFN = FNqueryM.nc FNaggavgM.nc FNaggmaxM.nc FNaggminM.nc
  
! all: gen/commfns.vmsf gen/mhopfns.vmsf gen/queryfns.vmsf \
!      sgen/commfns.vmsf sgen/mhopfns.vmsf sgen/queryfns.vmsf
  
  gen/commfns.vmsf: $(COMMFN)
***************
*** 18,19 ****
--- 19,35 ----
  	echo '<CONTEXT NAME="EpochChange">' >>$@
  
+ sgen/commfns.vmsf: $(COMMFN)
+ 	perl ../tools/genfns.pl -scheme $@ $(COMMFN)
+ 	echo '<CONTEXT NAME="Receive">' >>$@
+ 
+ sgen/mhopfns.vmsf: $(MHOPFN)
+ 	perl ../tools/genfns.pl -scheme $@ $(MHOPFN)
+ 	echo '<CONTEXT NAME="Snoop">' >>$@
+ 	echo '<CONTEXT NAME="Intercept">' >>$@
+ 
+ sgen/queryfns.vmsf: $(QUERYFN)
+ 	perl ../tools/genfns.pl -scheme $@ $(QUERYFN)
+ 	echo '<CONTEXT NAME="EpochChange">' >>$@
+ 
+ clean:
+ 	rm -rf gen sgen

More information about the Tinyos-commits mailing list