Updates

Instr-count updates
Testcase updates

diff --git a/codeb/codea_skinner33_21.instr b/codeb/codea_skinner33_21.instr
index 45a4fb75db864000d01701c0f7a51864bd4daabf..1e8b314962144c26d5e0e50fd29d2ca327864913 100644 (file)
--- a/codeb/codea_skinner33_21.instr
+++ b/codeb/codea_skinner33_21.instr
@@ -1 +1 @@
-8
+6

diff --git a/codeb/georg_asma_00.instr b/codeb/georg_asma_00.instr
new file mode 100644 (file)
index 0000000..45a4fb7
--- /dev/null
+++ b/codeb/georg_asma_00.instr
@@ -0,0 +1 @@
+8

diff --git a/codeb/georg_asma_01.instr b/codeb/georg_asma_01.instr
new file mode 100644 (file)
index 0000000..0ca45a0
--- /dev/null
+++ b/codeb/georg_asma_01.instr
@@ -0,0 +1 @@
+394

diff --git a/codeb/georg_asma_02.instr b/codeb/georg_asma_02.instr
new file mode 100644 (file)
index 0000000..25685cf
--- /dev/null
+++ b/codeb/georg_asma_02.instr
@@ -0,0 +1 @@
+393

diff --git a/codeb/georg_asma_03.instr b/codeb/georg_asma_03.instr
new file mode 100644 (file)
index 0000000..e01062f
--- /dev/null
+++ b/codeb/georg_asma_03.instr
@@ -0,0 +1 @@
+282

diff --git a/codeb/georg_asma_04.instr b/codeb/georg_asma_04.instr
new file mode 100644 (file)
index 0000000..cb1a40d
--- /dev/null
+++ b/codeb/georg_asma_04.instr
@@ -0,0 +1 @@
+250

diff --git a/codeb/georg_asmb_00.instr b/codeb/georg_asmb_00.instr
new file mode 100644 (file)
index 0000000..aabe6ec
--- /dev/null
+++ b/codeb/georg_asmb_00.instr
@@ -0,0 +1 @@
+21

diff --git a/codeb/georg_asmb_01.instr b/codeb/georg_asmb_01.instr
new file mode 100644 (file)
index 0000000..0751c1b
--- /dev/null
+++ b/codeb/georg_asmb_01.instr
@@ -0,0 +1 @@
+572

diff --git a/codeb/georg_fib_001.instr b/codeb/georg_fib_001.instr
new file mode 100644 (file)
index 0000000..95de1ee
--- /dev/null
+++ b/codeb/georg_fib_001.instr
@@ -0,0 +1 @@
+297

diff --git a/codeb/georg_fib_021.instr b/codeb/georg_fib_021.instr
new file mode 100644 (file)
index 0000000..f20bd4e
--- /dev/null
+++ b/codeb/georg_fib_021.instr
@@ -0,0 +1 @@
+292

diff --git a/codeb/georg_fib_022.instr b/codeb/georg_fib_022.instr
new file mode 100644 (file)
index 0000000..ea80947
--- /dev/null
+++ b/codeb/georg_fib_022.instr
@@ -0,0 +1 @@
+288

diff --git a/codeb/georg_fib_023.instr b/codeb/georg_fib_023.instr
new file mode 100644 (file)
index 0000000..e64f24d
--- /dev/null
+++ b/codeb/georg_fib_023.instr
@@ -0,0 +1 @@
+336

diff --git a/codeb/georg_fib_024.instr b/codeb/georg_fib_024.instr
new file mode 100644 (file)
index 0000000..4dab36b
--- /dev/null
+++ b/codeb/georg_fib_024.instr
@@ -0,0 +1 @@
+317

diff --git a/codeb/georg_fib_025.instr b/codeb/georg_fib_025.instr
new file mode 100644 (file)
index 0000000..4438e30
--- /dev/null
+++ b/codeb/georg_fib_025.instr
@@ -0,0 +1 @@
+293

diff --git a/codeb/georg_fib_026.instr b/codeb/georg_fib_026.instr
new file mode 100644 (file)
index 0000000..4438e30
--- /dev/null
+++ b/codeb/georg_fib_026.instr
@@ -0,0 +1 @@
+293

diff --git a/codeb/georg_fib_027.instr b/codeb/georg_fib_027.instr
new file mode 100644 (file)
index 0000000..4753102
--- /dev/null
+++ b/codeb/georg_fib_027.instr
@@ -0,0 +1 @@
+365

diff --git a/codeb/georg_fib_028.instr b/codeb/georg_fib_028.instr
new file mode 100644 (file)
index 0000000..4753102
--- /dev/null
+++ b/codeb/georg_fib_028.instr
@@ -0,0 +1 @@
+365

diff --git a/codeb/georg_fib_041.instr b/codeb/georg_fib_041.instr
new file mode 100644 (file)
index 0000000..b4f334f
--- /dev/null
+++ b/codeb/georg_fib_041.instr
@@ -0,0 +1 @@
+141

diff --git a/codeb/georg_fib_042.instr b/codeb/georg_fib_042.instr
new file mode 100644 (file)
index 0000000..997def4
--- /dev/null
+++ b/codeb/georg_fib_042.instr
@@ -0,0 +1 @@
+237

diff --git a/codeb/georg_fib_043.instr b/codeb/georg_fib_043.instr
new file mode 100644 (file)
index 0000000..4438e30
--- /dev/null
+++ b/codeb/georg_fib_043.instr
@@ -0,0 +1 @@
+293

diff --git a/codeb/georg_fib_044.instr b/codeb/georg_fib_044.instr
new file mode 100644 (file)
index 0000000..38a45c3
--- /dev/null
+++ b/codeb/georg_fib_044.instr
@@ -0,0 +1 @@
+374

diff --git a/codeb/skinner33_01.instr b/codeb/skinner33_01.instr
index 8f92bfdd49766b1907d4aec8d3b0f9ed6129d0e6..bb95160cb6e07358f54a28a208ae41e69889c97b 100644 (file)
--- a/codeb/skinner33_01.instr
+++ b/codeb/skinner33_01.instr
@@ -1 +1 @@
-35
+33

diff --git a/codeb/skinner33_02.0 b/codeb/skinner33_02.0
index 3f7adbf781a23f6feb08af49a567eb86f0332e06..17c6bb5d0bd4de451832eb1de0791061bd5da6bd 100644 (file)
--- a/codeb/skinner33_02.0
+++ b/codeb/skinner33_02.0
@@ -15,3 +15,10 @@ method bar(n)
        return x;
 end;
 
        return x;
 end;
 

+method bla(m n)
+       if not((m-n) < (m*n)) then
+               return m;
+       else
+               return n;
+       end; 
+end;

diff --git a/codeb/skinner33_02.call b/codeb/skinner33_02.call
index a0c18251afe41872bc37ddd0eac31753a37d0ab9..e07c4893b71db8e6ab42ee3ea20a463db1575beb 100644 (file)
--- a/codeb/skinner33_02.call
+++ b/codeb/skinner33_02.call
@@ -1,9 +1,10 @@
 
 long foo(long);
 long bar(long*, long);
 
 long foo(long);
 long bar(long*, long);

+long bla(long, long, long);

 
 long muh[] = {1, 3};
 long kuh[] = {2,6};
 
 
 long muh[] = {1, 3};
 long kuh[] = {2,6};
 

-RET(foo(1) == 20 && foo(0) == 5 && bar(muh, 5) == 5 && muh[0] == 5 && bar(muh,10) == 10 && muh[0] == 10 ); 
+RET(foo(1) == 20 && foo(0) == 5 && bar(muh, 5) == 5 && muh[0] == 5 && bar(muh,10) == 10 && muh[0] == 10 && bla(0xDEAF, 10,1) == 1 && bla(0xABC, 10,-1) == 10 ); 

 
 

diff --git a/codeb/skinner33_02.instr b/codeb/skinner33_02.instr
index 2bd5a0a98a36cc08ada88b804d3be047e6aa5b8a..e522732c77ec94723e739d22f28df549b0231f5f 100644 (file)
--- a/codeb/skinner33_02.instr
+++ b/codeb/skinner33_02.instr
@@ -1 +1 @@
-22
+38

diff --git a/codeb/skinner33_03.0 b/codeb/skinner33_03.0
index b799e02b76d808d15bb1d66ac36a25b73cc3183c..0a9ae3fe12fc4e896693553005d83d32c7c4ea5e 100644 (file)
--- a/codeb/skinner33_03.0
+++ b/codeb/skinner33_03.0
@@ -7,3 +7,71 @@ method foo(b)
                return (b - a);
        end;
 end;
                return (b - a);
        end;
 end;

+
+method bar(b)
+       if b - b then
+               return 3;
+       else
+               if b - this then
+                       return 2;
+               else
+                       if b * 0 then
+                               return 3;
+                       else
+                               if b * 1 then
+                                       return 1;
+                               else
+                                       return 4;
+                               end;
+                       end;
+               end;
+       end;
+end;
+
+method bla()
+       if a * 0 then
+               return 3;
+       else
+               if a * 1 then
+                       return 1;
+               else
+                       return 2;
+               end;
+       end;
+end;
+
+method blub()
+       if 0 * a then
+               return 3;
+       else
+               if 1 * a then
+                       return 1;
+               else
+                       return 2;
+               end;
+       end;
+end;
+
+method miau(n)
+       if 0 * (a - n) then
+               return 3;
+       else
+               if 1 * (a -n) then
+                       return 2;
+               else
+                       return (n-(a-1));
+               end;
+       end;
+end;
+
+method null(n)
+       if (a - n) * 0 then
+               return 3;
+       else
+               if (a -n) * 1 then
+                       return 2;
+               else
+                       return (a - (n<a));
+               end;
+       end;
+end;

diff --git a/codeb/skinner33_03.call b/codeb/skinner33_03.call
index ce6dee0fb0ec9e9b7957d621523667833bbdce4e..030c006dfa1acffa151b7ac6d2d036cdc4b91c5d 100644 (file)
--- a/codeb/skinner33_03.call
+++ b/codeb/skinner33_03.call
@@ -1,7 +1,12 @@
 
 long foo(long*, long);
 
 long foo(long*, long);

+long bar(long, long);
+long bla(long*);
+long blub(long*);
+long miau(long*, long);
+long null(long*, long);

 
 

-long muh[] = {4};
+long muh[] = {4}, kuh[] = {0};

 
 

-RET(foo(muh,5) == 1 && foo(muh, 2) == -2 && foo(muh,0) == -4);
+RET(foo(muh,5) == 1 && foo(muh, 2) == -2 && foo(muh,0) == -4 && bar(3,5) == 1&& bar(5,5) == 2 && bar(4,0) == 4 && bla(muh) == 1 && bla(kuh) == 2 && blub(muh) == 1 && blub(kuh) == 2 && miau(muh, 3) == 2 && miau(muh,4) == 1 && null(muh,3) == 2 && null(muh,4) == 4 );

 
 

diff --git a/codeb/skinner33_03.instr b/codeb/skinner33_03.instr
index 48082f72f087ce7e6fa75b9c41d7387daecd447b..fe4afb0df8641d6de901cdde04199e4507534d0d 100644 (file)
--- a/codeb/skinner33_03.instr
+++ b/codeb/skinner33_03.instr
@@ -1 +1 @@
-12
+106

diff --git a/codeb/skinner33_04.0 b/codeb/skinner33_04.0
index c59bdd9a807d1831f0aae2550ef429763316fde4..3690ecf62c160ec3a83b594b14cb4637a219ae28 100644 (file)
--- a/codeb/skinner33_04.0
+++ b/codeb/skinner33_04.0
@@ -11,3 +11,42 @@ method foo(n)
        end;
        return 0x9999;
 end;
        end;
        return 0x9999;
 end;

+
+method bar(n)
+       var x := not(5 < (n*2));
+       if x then
+               return n - (2*n);
+       else
+               x := 3 * (4 * n);
+               return x;
+       end;
+end;
+
+method bla(n)
+       if not(not(2 * ( 5 * (n or n)))) then
+               return 1;
+       else
+               return 0;
+       end;
+end;
+
+method blubb(n)
+       if not((n*n) < 20) then
+               return 20;
+       else
+               if not(not(n)) then
+                       return 10;
+               else
+                       return 5;
+               end;
+       end;
+end;
+
+struct q r s t end;
+
+method miau(n m)
+       r := 5 * ((n-m) * 3);
+       s := 7 * (q * 5);
+       t := 40000000 * (4 * q);
+       return 0;
+end;

diff --git a/codeb/skinner33_04.call b/codeb/skinner33_04.call
index 84677a8e4863430505ec0d47aedd8765925eee81..9a72a23e8e9664dd4a149c08fa453cc714819191 100644 (file)
--- a/codeb/skinner33_04.call
+++ b/codeb/skinner33_04.call
@@ -1,9 +1,15 @@
 
 long foo(long*, long);
 
 long foo(long*, long);

+long bar(long, long);
+long bla(long, long);
+long blubb(long, long);
+long miau(long*, long, long);

 
 long muh[] = {10, 3};
 long kuh[] = {2,6};
 
 
 long muh[] = {10, 3};
 long kuh[] = {2,6};
 

+long narf[] = {1,4,5,6};
+long puit[] = {4,3,2,1};

 
 

-RET(foo(muh, 10) == 1 && muh[1] == 3 && muh[0] == 3 && foo(kuh, 50) == 14 && kuh[0] == 6 && kuh[1] == 6 ); 
+RET(foo(muh, 10) == 1 && muh[1] == 3 && muh[0] == 3 && foo(kuh, 50) == 14 && kuh[0] == 6 && kuh[1] == 6 && bar(0xf00,2) == -2 && bar(0xf00,3) == 36 && bla(0x42, 4) == 1 && bla(0x42, 0) == 0 && blubb(0x1337, 3) == 10 && blubb(0xA, 0) == 5 && blubb(0xB, 5) == 20 && miau(narf, 4, 5) == 0 && narf[0] == 1 && narf[1] == -15 && narf[2] == 35 && narf[3] == 160000000 && miau(puit, 6,3) == 0 && puit[0] == 4 && puit[1] == 45 && puit[2] == 140 && puit[3] == 640000000);

 
 

diff --git a/codeb/skinner33_04.instr b/codeb/skinner33_04.instr
index a45fd52cc5891570d6299fab38643103c3955474..29d6383b52c1352e92a45875b5bb206f89139643 100644 (file)
--- a/codeb/skinner33_04.instr
+++ b/codeb/skinner33_04.instr
@@ -1 +1 @@
-24
+100