diff options
Diffstat (limited to 'js/IntegerOp')
-rw-r--r-- | js/IntegerOp/BITCLEAR.js | 2 | ||||
-rw-r--r-- | js/IntegerOp/BITCLEAR.pickle | 3 | ||||
-rw-r--r-- | js/IntegerOp/BITSET.js | 2 | ||||
-rw-r--r-- | js/IntegerOp/BITSET.pickle | 3 | ||||
-rw-r--r-- | js/IntegerOp/CONVERT.js | 2 | ||||
-rw-r--r-- | js/IntegerOp/CONVERT.pickle | 3 | ||||
-rw-r--r-- | js/IntegerOp/DFLIPFLOP.js | 2 | ||||
-rw-r--r-- | js/IntegerOp/DFLIPFLOP.pickle | 3 | ||||
-rw-r--r-- | js/IntegerOp/DLATCH.js | 2 | ||||
-rw-r--r-- | js/IntegerOp/DLATCH.pickle | 3 | ||||
-rw-r--r-- | js/IntegerOp/EXTRACTBITS.js | 2 | ||||
-rw-r--r-- | js/IntegerOp/EXTRACTBITS.pickle | 3 | ||||
-rw-r--r-- | js/IntegerOp/INTMUL.js | 2 | ||||
-rw-r--r-- | js/IntegerOp/INTMUL.pickle | 3 | ||||
-rw-r--r-- | js/IntegerOp/JKFLIPFLOP.js | 2 | ||||
-rw-r--r-- | js/IntegerOp/JKFLIPFLOP.pickle | 2 | ||||
-rw-r--r-- | js/IntegerOp/LOGIC.js | 2 | ||||
-rw-r--r-- | js/IntegerOp/LOGIC.pickle | 3 | ||||
-rw-r--r-- | js/IntegerOp/SHIFT.js | 2 | ||||
-rw-r--r-- | js/IntegerOp/SHIFT.pickle | 3 | ||||
-rw-r--r-- | js/IntegerOp/SRFLIPFLOP.js | 2 | ||||
-rw-r--r-- | js/IntegerOp/SRFLIPFLOP.pickle | 2 |
22 files changed, 22 insertions, 31 deletions
diff --git a/js/IntegerOp/BITCLEAR.js b/js/IntegerOp/BITCLEAR.js index 0689e2f5..6d81f4d7 100644 --- a/js/IntegerOp/BITCLEAR.js +++ b/js/IntegerOp/BITCLEAR.js @@ -14,7 +14,7 @@ function BITCLEAR() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITCLEAR\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } BITCLEAR.prototype.details = function BITCLEAR() { diff --git a/js/IntegerOp/BITCLEAR.pickle b/js/IntegerOp/BITCLEAR.pickle index b1c2bf88..dd6af494 100644 --- a/js/IntegerOp/BITCLEAR.pickle +++ b/js/IntegerOp/BITCLEAR.pickle @@ -101,8 +101,7 @@ p32 g9 sS'x' p33 -g7 -sS'model' +NsS'model' p34 g2 sS'ot' diff --git a/js/IntegerOp/BITSET.js b/js/IntegerOp/BITSET.js index e6b8ea9b..383d7931 100644 --- a/js/IntegerOp/BITSET.js +++ b/js/IntegerOp/BITSET.js @@ -14,7 +14,7 @@ function BITSET() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"BITSET\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } BITSET.prototype.details = function BITSET() { diff --git a/js/IntegerOp/BITSET.pickle b/js/IntegerOp/BITSET.pickle index b1c2bf88..dd6af494 100644 --- a/js/IntegerOp/BITSET.pickle +++ b/js/IntegerOp/BITSET.pickle @@ -101,8 +101,7 @@ p32 g9 sS'x' p33 -g7 -sS'model' +NsS'model' p34 g2 sS'ot' diff --git a/js/IntegerOp/CONVERT.js b/js/IntegerOp/CONVERT.js index 70802f2e..2e2eb015 100644 --- a/js/IntegerOp/CONVERT.js +++ b/js/IntegerOp/CONVERT.js @@ -16,7 +16,7 @@ function CONVERT() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(1)],[sci2exp(3)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"CONVERT\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } CONVERT.prototype.details = function CONVERT() { diff --git a/js/IntegerOp/CONVERT.pickle b/js/IntegerOp/CONVERT.pickle index ad446663..2a3fa64a 100644 --- a/js/IntegerOp/CONVERT.pickle +++ b/js/IntegerOp/CONVERT.pickle @@ -104,8 +104,7 @@ p32 g10 sS'x' p33 -g5 -sS'model' +NsS'model' p34 g2 sS'ot' diff --git a/js/IntegerOp/DFLIPFLOP.js b/js/IntegerOp/DFLIPFLOP.js index fa98445a..b92a5905 100644 --- a/js/IntegerOp/DFLIPFLOP.js +++ b/js/IntegerOp/DFLIPFLOP.js @@ -89,7 +89,7 @@ function DFLIPFLOP() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DFLIPFLOP\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,[],this.gr_i); return new BasicBlock(this.x); } DFLIPFLOP.prototype.details = function DFLIPFLOP() { diff --git a/js/IntegerOp/DFLIPFLOP.pickle b/js/IntegerOp/DFLIPFLOP.pickle index 265b19d6..8f30eb1f 100644 --- a/js/IntegerOp/DFLIPFLOP.pickle +++ b/js/IntegerOp/DFLIPFLOP.pickle @@ -236,8 +236,7 @@ p77 g22 sS'x' p78 -g2 -sS'scs_m.objs[27-1]' +NsS'scs_m.objs[27-1]' p79 g2 sS'scs_m.objs[35-1]' diff --git a/js/IntegerOp/DLATCH.js b/js/IntegerOp/DLATCH.js index 82f671af..9f99ed3d 100644 --- a/js/IntegerOp/DLATCH.js +++ b/js/IntegerOp/DLATCH.js @@ -34,7 +34,7 @@ function DLATCH() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"DLATCH\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,[],this.gr_i); return new BasicBlock(this.x); } DLATCH.prototype.details = function DLATCH() { diff --git a/js/IntegerOp/DLATCH.pickle b/js/IntegerOp/DLATCH.pickle index 9e7002ba..519c7f47 100644 --- a/js/IntegerOp/DLATCH.pickle +++ b/js/IntegerOp/DLATCH.pickle @@ -124,8 +124,7 @@ p39 g11 sS'x' p40 -g6 -sS'model' +NsS'model' p41 S'object' p42 diff --git a/js/IntegerOp/EXTRACTBITS.js b/js/IntegerOp/EXTRACTBITS.js index 0cf1fcea..afa6ea2e 100644 --- a/js/IntegerOp/EXTRACTBITS.js +++ b/js/IntegerOp/EXTRACTBITS.js @@ -15,7 +15,7 @@ function EXTRACTBITS() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(1)],[sci2exp(0)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"EXTRACTBITS\",sz(1),sz(2));"]); - this.x = standard_define([4,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([4,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } EXTRACTBITS.prototype.details = function EXTRACTBITS() { diff --git a/js/IntegerOp/EXTRACTBITS.pickle b/js/IntegerOp/EXTRACTBITS.pickle index 94754555..351da178 100644 --- a/js/IntegerOp/EXTRACTBITS.pickle +++ b/js/IntegerOp/EXTRACTBITS.pickle @@ -111,8 +111,7 @@ p34 g2 sS'x' p35 -g10 -sS'model' +NsS'model' p36 g4 sS'ot' diff --git a/js/IntegerOp/INTMUL.js b/js/IntegerOp/INTMUL.js index 7e781cf7..fde3f0aa 100644 --- a/js/IntegerOp/INTMUL.js +++ b/js/IntegerOp/INTMUL.js @@ -16,7 +16,7 @@ function INTMUL() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"INTMUL\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } INTMUL.prototype.details = function INTMUL() { diff --git a/js/IntegerOp/INTMUL.pickle b/js/IntegerOp/INTMUL.pickle index b83d7e98..644e2bf3 100644 --- a/js/IntegerOp/INTMUL.pickle +++ b/js/IntegerOp/INTMUL.pickle @@ -102,8 +102,7 @@ p32 g11 sS'x' p33 -g8 -sS'model' +NsS'model' p34 g2 sS'ot' diff --git a/js/IntegerOp/JKFLIPFLOP.js b/js/IntegerOp/JKFLIPFLOP.js index 69417c73..63b245c0 100644 --- a/js/IntegerOp/JKFLIPFLOP.js +++ b/js/IntegerOp/JKFLIPFLOP.js @@ -45,7 +45,7 @@ function JKFLIPFLOP() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"JKFLIPFLOP\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,[],this.gr_i); return new BasicBlock(this.x); } JKFLIPFLOP.prototype.details = function JKFLIPFLOP() { diff --git a/js/IntegerOp/JKFLIPFLOP.pickle b/js/IntegerOp/JKFLIPFLOP.pickle index cbfae693..08628169 100644 --- a/js/IntegerOp/JKFLIPFLOP.pickle +++ b/js/IntegerOp/JKFLIPFLOP.pickle @@ -209,7 +209,7 @@ p68 g7 sS'x' p69 -g7 +g2 sS'model' p70 g2 diff --git a/js/IntegerOp/LOGIC.js b/js/IntegerOp/LOGIC.js index 2f0cb139..7add8e96 100644 --- a/js/IntegerOp/LOGIC.js +++ b/js/IntegerOp/LOGIC.js @@ -17,7 +17,7 @@ function LOGIC() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(this.mat)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"LOGIC\",sz(1),sz(2));"]); - this.x = standard_define([2,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([2,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } LOGIC.prototype.details = function LOGIC() { diff --git a/js/IntegerOp/LOGIC.pickle b/js/IntegerOp/LOGIC.pickle index d39f0580..7f0a03e2 100644 --- a/js/IntegerOp/LOGIC.pickle +++ b/js/IntegerOp/LOGIC.pickle @@ -110,8 +110,7 @@ p35 g9 sS'x' p36 -g5 -sS'model' +NsS'model' p37 g2 sS'ot' diff --git a/js/IntegerOp/SHIFT.js b/js/IntegerOp/SHIFT.js index 19741f29..561f2faa 100644 --- a/js/IntegerOp/SHIFT.js +++ b/js/IntegerOp/SHIFT.js @@ -17,7 +17,7 @@ function SHIFT() { this.model.dep_ut = new ScilabDouble([true,false]); this.exprs = [[sci2exp(3)],[sci2exp(0)],[sci2exp(0)]]; this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SHIFT\",sz(1),sz(2));"]); - this.x = standard_define([3,2],this.model,this.exprs,this.gr_i); + this.x = new standard_define(new ScilabDouble([3,2]),this.model,this.exprs,this.gr_i); return new BasicBlock(this.x); } SHIFT.prototype.details = function SHIFT() { diff --git a/js/IntegerOp/SHIFT.pickle b/js/IntegerOp/SHIFT.pickle index 076ec6f3..d71a0979 100644 --- a/js/IntegerOp/SHIFT.pickle +++ b/js/IntegerOp/SHIFT.pickle @@ -99,8 +99,7 @@ p31 g18 sS'x' p32 -g2 -sS'model' +NsS'model' p33 g4 sS'ot' diff --git a/js/IntegerOp/SRFLIPFLOP.js b/js/IntegerOp/SRFLIPFLOP.js index 14eca627..b8b762cf 100644 --- a/js/IntegerOp/SRFLIPFLOP.js +++ b/js/IntegerOp/SRFLIPFLOP.js @@ -29,7 +29,7 @@ function SRFLIPFLOP() { this.model.dep_ut = new ScilabDouble([true,false]); this.model.rpar = new ScilabDouble([scs_m]); this.gr_i = new ScilabString(["xstringb(orig(1),orig(2),\"SRFLIPFLOP\",sz(1),sz(2));"]); - this.x = standard_define([2,3],this.model,[],this.gr_i); + this.x = new standard_define(new ScilabDouble([2,3]),this.model,[],this.gr_i); return new BasicBlock(this.x); } SRFLIPFLOP.prototype.details = function SRFLIPFLOP() { diff --git a/js/IntegerOp/SRFLIPFLOP.pickle b/js/IntegerOp/SRFLIPFLOP.pickle index 30a56f4d..a1c8301d 100644 --- a/js/IntegerOp/SRFLIPFLOP.pickle +++ b/js/IntegerOp/SRFLIPFLOP.pickle @@ -160,7 +160,7 @@ p52 g13 sS'x' p53 -g13 +g2 sS'model' p54 g2 |