From: Martin Perner Date: Sun, 30 May 2010 18:32:22 +0000 (+0200) Subject: Updates X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=testub10.git;a=commitdiff_plain;h=4388e9ccbd9a1667d569485ed868e599e4513457 Updates Instr-count updates Testcase updates --- diff --git a/codeb/codea_skinner33_21.instr b/codeb/codea_skinner33_21.instr index 45a4fb7..1e8b314 100644 --- 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 8f92bfd..bb95160 100644 --- 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 3f7adbf..17c6bb5 100644 --- a/codeb/skinner33_02.0 +++ b/codeb/skinner33_02.0 @@ -15,3 +15,10 @@ method bar(n) 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 a0c1825..e07c489 100644 --- a/codeb/skinner33_02.call +++ b/codeb/skinner33_02.call @@ -1,9 +1,10 @@ long foo(long); long bar(long*, long); +long bla(long, long, long); 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 2bd5a0a..e522732 100644 --- 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 b799e02..0a9ae3f 100644 --- a/codeb/skinner33_03.0 +++ b/codeb/skinner33_03.0 @@ -7,3 +7,71 @@ method foo(b) 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