From e48d38c7f3d91a35863040ac9d685e20366daea5 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Thu, 10 Jun 2010 16:04:55 +0200 Subject: [PATCH] ppc: 'neue' testfaelle angepasst --- gesamt_ppc/codea_intelli_05.call | 8 ++-- gesamt_ppc/codea_intelli_06.call | 4 +- gesamt_ppc/codea_intelli_07.0 | 2 +- gesamt_ppc/codea_intelli_07.call | 4 +- gesamt_ppc/codea_intelli_08.call | 4 +- gesamt_ppc/codea_lewurm_07.call | 6 +++ gesamt_ppc/codea_lewurm_09.0 | 2 +- gesamt_ppc/codea_lewurm_11.call | 1 + gesamt_ppc/codea_mrstrcmp_08.0 | 2 +- gesamt_ppc/codea_mrstrcmp_13.call | 34 +++++++------- gesamt_ppc/codea_mrstrcmp_14.call | 34 +++++++------- gesamt_ppc/codea_skinner33_04.call | 26 +++++------ gesamt_ppc/codea_skinner33_05.call | 26 +++++------ gesamt_ppc/codea_skinner33_06.call | 26 +++++------ gesamt_ppc/codea_skinner33_07.call | 16 +++---- gesamt_ppc/codea_skinner33_08.call | 16 +++---- gesamt_ppc/codea_skinner33_09.call | 16 +++---- gesamt_ppc/codea_skinner33_10.call | 16 +++---- gesamt_ppc/codea_skinner33_11.call | 16 +++---- gesamt_ppc/codea_skinner33_12.call | 16 +++---- gesamt_ppc/codea_skinner33_13.call | 16 +++---- gesamt_ppc/codea_skinner33_14.call | 16 +++---- gesamt_ppc/codea_skinner33_21.0 | 2 +- gesamt_ppc/codeb_georg_fib_043.0 | 16 +++---- gesamt_ppc/codeb_georg_fib_044.0 | 4 +- gesamt_ppc/codeb_intelli_02.call | 4 +- gesamt_ppc/codeb_intelli_03.call | 6 +-- gesamt_ppc/codeb_intelli_04.call | 4 +- gesamt_ppc/codeb_intelli_05.call | 6 +-- gesamt_ppc/codeb_intelli_06.call | 4 +- gesamt_ppc/codeb_intelli_07.call | 4 +- gesamt_ppc/codeb_intelli_08.call | 4 +- gesamt_ppc/codeb_intelli_09.call | 4 +- gesamt_ppc/codeb_intelli_10.call | 8 +++- gesamt_ppc/codeb_intelli_11.call | 4 +- gesamt_ppc/codeb_intelli_12.call | 2 +- gesamt_ppc/codeb_intelli_13.call | 4 +- gesamt_ppc/codeb_intelli_14.0 | 8 ++-- gesamt_ppc/codeb_intelli_14.call | 6 +-- gesamt_ppc/codeb_intelli_15.0 | 4 +- gesamt_ppc/codeb_intelli_15.call | 8 ++-- gesamt_ppc/skinner33_02.call | 8 ++-- scripts/debug_gesamt_ppc | 73 ++++++++++++++++++++++++++++++ scripts/modlvatest_gesamt_ppc.sh | 8 ++-- 44 files changed, 291 insertions(+), 207 deletions(-) create mode 100755 scripts/debug_gesamt_ppc diff --git a/gesamt_ppc/codea_intelli_05.call b/gesamt_ppc/codea_intelli_05.call index 6e296ea..428a9ed 100644 --- a/gesamt_ppc/codea_intelli_05.call +++ b/gesamt_ppc/codea_intelli_05.call @@ -1,9 +1,9 @@ -extern long long f(long long*, long long*, long long); -extern long long g(long long*, long long*); +extern int f(int*, int*, int); +extern int g(int*, int*); -long long ar[10]; -long long ar2[10]; +int ar[10]; +int ar2[10]; int i = 1; for(; i <= 10; i++) ar[i-1] = i; diff --git a/gesamt_ppc/codea_intelli_06.call b/gesamt_ppc/codea_intelli_06.call index 42435f0..b3a03d8 100644 --- a/gesamt_ppc/codea_intelli_06.call +++ b/gesamt_ppc/codea_intelli_06.call @@ -1,7 +1,7 @@ -extern long long f(long long*); +extern int f(int*); -long long ar[10]; +int ar[10]; int i = 1; for(; i <= 10; i++) ar[i-1] = i; diff --git a/gesamt_ppc/codea_intelli_07.0 b/gesamt_ppc/codea_intelli_07.0 index 0394e3c..46e56d3 100644 --- a/gesamt_ppc/codea_intelli_07.0 +++ b/gesamt_ppc/codea_intelli_07.0 @@ -1,5 +1,5 @@ struct x y z end; method f(a) - return (a - (-3*8)).y; + return (a - (-3*4)).y; end; diff --git a/gesamt_ppc/codea_intelli_07.call b/gesamt_ppc/codea_intelli_07.call index 1c49d3f..82879f6 100644 --- a/gesamt_ppc/codea_intelli_07.call +++ b/gesamt_ppc/codea_intelli_07.call @@ -1,6 +1,6 @@ -extern long long f(long long*, long long*); +extern int f(int*, int*); -long long ar[10]; +int ar[10]; int i = 1; for(; i <= 10; i++) ar[i-1] = i; diff --git a/gesamt_ppc/codea_intelli_08.call b/gesamt_ppc/codea_intelli_08.call index 2153dc3..e8b76e3 100644 --- a/gesamt_ppc/codea_intelli_08.call +++ b/gesamt_ppc/codea_intelli_08.call @@ -1,6 +1,6 @@ -extern long long f(long long*, long long*); +extern int f(int*, int*); -long long ar[10]; +int ar[10]; int i = 1; for(; i <= 10; i++) ar[i-1] = i; diff --git a/gesamt_ppc/codea_lewurm_07.call b/gesamt_ppc/codea_lewurm_07.call index 5df2bd6..b48bf11 100644 --- a/gesamt_ppc/codea_lewurm_07.call +++ b/gesamt_ppc/codea_lewurm_07.call @@ -4,4 +4,10 @@ long y(long); long z(long); long override(long); +printf("w(20,30)(1): %d\n", w(20,30)); +printf("w(30,20)(0): %d\n", w(30,20)); +printf("x(400)(0): %d\n", x(400)); +printf("y(400)(1): %d\n", y(400)); +printf("z(400)(0): %d\n", z(400)); +printf("override(0x1)(0x55555): %x\n", override(0x1)); RET(w(20,30)==1 && override(0x1)==0x55555 && w(30,20)==0 && override(1)==0x55555 && x(400)==0 && override(0x1)==0x55555 && y(400)==1 && override(0x1)==0x55555 && z(400)==0 && override(0x1)==0x55555); diff --git a/gesamt_ppc/codea_lewurm_09.0 b/gesamt_ppc/codea_lewurm_09.0 index b42b238..d6326ab 100644 --- a/gesamt_ppc/codea_lewurm_09.0 +++ b/gesamt_ppc/codea_lewurm_09.0 @@ -8,5 +8,5 @@ method x() end; method y() - return (this-8).k; + return (this-4).k; end; diff --git a/gesamt_ppc/codea_lewurm_11.call b/gesamt_ppc/codea_lewurm_11.call index 067edca..2535c88 100644 --- a/gesamt_ppc/codea_lewurm_11.call +++ b/gesamt_ppc/codea_lewurm_11.call @@ -38,6 +38,7 @@ if ((void *)-1 == addr) { addr[2] = 1337; +printf("t: %d\n", t); switch (t) { case 0: RET(try0(0xcafebabe) == 1337); case 1: RET(try1(0xcafebabe) == 1337); diff --git a/gesamt_ppc/codea_mrstrcmp_08.0 b/gesamt_ppc/codea_mrstrcmp_08.0 index 63d2815..47be288 100644 --- a/gesamt_ppc/codea_mrstrcmp_08.0 +++ b/gesamt_ppc/codea_mrstrcmp_08.0 @@ -3,6 +3,6 @@ struct end; method f(a) - return (a - (-8 * 4) ).v; + return (a - (-4 * 4) ).v; end; diff --git a/gesamt_ppc/codea_mrstrcmp_13.call b/gesamt_ppc/codea_mrstrcmp_13.call index 91ca672..8d401c3 100644 --- a/gesamt_ppc/codea_mrstrcmp_13.call +++ b/gesamt_ppc/codea_mrstrcmp_13.call @@ -35,21 +35,21 @@ RET(f1(0, 3, 20) == F1( 3, 20) && f(0, 10, -20, 30, -40) == F( 10, -20, 30, -40) && f(0, -10, -20, -30, -40) == F(-10, -20, -30, -40) && - f1(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F1(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f2(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F2(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f4(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F4(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f8(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F8(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - - f1(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F1(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f2(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F2(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f4(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F4(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f8(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F8(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL)); + f1(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F1(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f2(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F2(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f4(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F4(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f8(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F8(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + + f1(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F1(0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f2(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F2(0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f4(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F4(0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f8(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F8(0x8FFFFFFFUL, 0x8FFFFFFFUL)); diff --git a/gesamt_ppc/codea_mrstrcmp_14.call b/gesamt_ppc/codea_mrstrcmp_14.call index 91ca672..8d401c3 100644 --- a/gesamt_ppc/codea_mrstrcmp_14.call +++ b/gesamt_ppc/codea_mrstrcmp_14.call @@ -35,21 +35,21 @@ RET(f1(0, 3, 20) == F1( 3, 20) && f(0, 10, -20, 30, -40) == F( 10, -20, 30, -40) && f(0, -10, -20, -30, -40) == F(-10, -20, -30, -40) && - f1(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F1(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f2(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F2(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f4(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F4(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f8(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F8(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - - f1(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F1(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f2(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F2(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f4(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F4(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f8(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F8(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL)); + f1(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F1(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f2(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F2(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f4(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F4(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f8(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F8(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + + f1(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F1(0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f2(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F2(0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f4(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F4(0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f8(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F8(0x8FFFFFFFUL, 0x8FFFFFFFUL)); diff --git a/gesamt_ppc/codea_skinner33_04.call b/gesamt_ppc/codea_skinner33_04.call index d83320d..8fcbfe7 100644 --- a/gesamt_ppc/codea_skinner33_04.call +++ b/gesamt_ppc/codea_skinner33_04.call @@ -33,18 +33,18 @@ RET(f1(0, 3, 20) == F1( 3, 20) && f(0, 10, -20, 30, -40) == F( 10, -20, 30, -40) && f(0, -10, -20, -30, -40) == F(-10, -20, -30, -40) && - f1(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F1(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f2(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F2(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f3(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F3(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - - f1(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F1(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f2(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F2(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f3(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F3(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) + f1(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F1(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f2(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F2(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f3(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F3(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + + f1(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F1(0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f2(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F2(0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f3(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F3(0x8FFFFFFFUL, 0x8FFFFFFFUL) ); diff --git a/gesamt_ppc/codea_skinner33_05.call b/gesamt_ppc/codea_skinner33_05.call index 5c88f7a..66614b1 100644 --- a/gesamt_ppc/codea_skinner33_05.call +++ b/gesamt_ppc/codea_skinner33_05.call @@ -26,18 +26,18 @@ RET(f1(0, 3, 20) == F1( 3, 20) && f3(0, 50, -9) == F3( 50, -9) && f3(0, -77, -50) == F3( -77, -50) && - f1(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F1(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f2(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F2(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f3(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F3(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - - f1(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F1(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f2(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F2(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f3(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F3(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) + f1(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F1(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f2(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F2(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f3(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F3(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + + f1(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F1(0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f2(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F2(0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f3(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F3(0x8FFFFFFFUL, 0x8FFFFFFFUL) ); diff --git a/gesamt_ppc/codea_skinner33_06.call b/gesamt_ppc/codea_skinner33_06.call index 7ea7701..7dc8c9a 100644 --- a/gesamt_ppc/codea_skinner33_06.call +++ b/gesamt_ppc/codea_skinner33_06.call @@ -34,17 +34,17 @@ RET(f1(0, 3, 20) == F1( 3, 20) && f(0, 10, -20, 30, -40) == F( 10, -20, 30, -40) && f(0, -10, -20, -30, -40) == F(-10, -20, -30, -40) && - f1(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F1(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f2(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F2(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f3(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F3(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - - f1(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F1(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f2(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F2(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f3(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F3(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) + f1(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F1(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f2(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F2(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f3(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F3(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + + f1(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F1(0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f2(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F2(0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f3(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F3(0x8FFFFFFFUL, 0x8FFFFFFFUL) ); diff --git a/gesamt_ppc/codea_skinner33_07.call b/gesamt_ppc/codea_skinner33_07.call index 62902cc..74d4103 100644 --- a/gesamt_ppc/codea_skinner33_07.call +++ b/gesamt_ppc/codea_skinner33_07.call @@ -15,14 +15,14 @@ RET(f1(0, 3, 20, 15) == F1( 3, 20, 15) && f2(0, 50, -9, -5) == F2( 50, -9, -5) && f2(0, -77, -50, 87) == F2( -77, -50, 87) && - f1(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F1(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f2(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F2(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && + f1(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F1(0x7FFFFFFFUL, 0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f2(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F2(0x7FFFFFFFUL, 0x7FFFFFFFUL, 0x7FFFFFFFUL) && - f1(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F1(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f2(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F2(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) + f1(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F1(0x8FFFFFFFUL, 0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f2(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F2(0x8FFFFFFFUL, 0x8FFFFFFFUL, 0x8FFFFFFFUL) ); diff --git a/gesamt_ppc/codea_skinner33_08.call b/gesamt_ppc/codea_skinner33_08.call index 2fbb006..b20406e 100644 --- a/gesamt_ppc/codea_skinner33_08.call +++ b/gesamt_ppc/codea_skinner33_08.call @@ -15,14 +15,14 @@ RET(f1(0, 3, 20, 15) == F1( 3, 20, 15) && f2(0, 50, -9, -5) == F2( 50, -9, -5) && f2(0, -77, -50, 87) == F2( -77, -50, 87) && - f1(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F1(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f2(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F2(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && + f1(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F1(0x7FFFFFFFUL, 0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f2(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F2(0x7FFFFFFFUL, 0x7FFFFFFFUL, 0x7FFFFFFFUL) && - f1(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F1(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f2(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F2(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) + f1(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F1(0x8FFFFFFFUL, 0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f2(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F2(0x8FFFFFFFUL, 0x8FFFFFFFUL, 0x8FFFFFFFUL) ); diff --git a/gesamt_ppc/codea_skinner33_09.call b/gesamt_ppc/codea_skinner33_09.call index 224059c..71d0e7b 100644 --- a/gesamt_ppc/codea_skinner33_09.call +++ b/gesamt_ppc/codea_skinner33_09.call @@ -15,14 +15,14 @@ RET(f1(0, 3, 20, 15) == F1( 3, 20, 15) && f2(0, 50, -9, -5) == F2( 50, -9, -5) && f2(0, -77, -50, 87) == F2( -77, -50, 87) && - f1(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F1(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f2(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F2(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && + f1(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F1(0x7FFFFFFFUL, 0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f2(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F2(0x7FFFFFFFUL, 0x7FFFFFFFUL, 0x7FFFFFFFUL) && - f1(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F1(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f2(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F2(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) + f1(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F1(0x8FFFFFFFUL, 0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f2(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F2(0x8FFFFFFFUL, 0x8FFFFFFFUL, 0x8FFFFFFFUL) ); diff --git a/gesamt_ppc/codea_skinner33_10.call b/gesamt_ppc/codea_skinner33_10.call index a2eb7e9..5ade799 100644 --- a/gesamt_ppc/codea_skinner33_10.call +++ b/gesamt_ppc/codea_skinner33_10.call @@ -15,14 +15,14 @@ RET(f1(0, 3, 20, 15) == F1( 3, 20, 15) && f2(0, 50, -9, -5) == F2( 50, -9, -5) && f2(0, -77, -50, 87) == F2( -77, -50, 87) && - f1(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F1(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f2(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F2(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && + f1(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F1(0x7FFFFFFFUL, 0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f2(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F2(0x7FFFFFFFUL, 0x7FFFFFFFUL, 0x7FFFFFFFUL) && - f1(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F1(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f2(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F2(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) + f1(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F1(0x8FFFFFFFUL, 0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f2(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F2(0x8FFFFFFFUL, 0x8FFFFFFFUL, 0x8FFFFFFFUL) ); diff --git a/gesamt_ppc/codea_skinner33_11.call b/gesamt_ppc/codea_skinner33_11.call index 3c9cdce..3e0cbda 100644 --- a/gesamt_ppc/codea_skinner33_11.call +++ b/gesamt_ppc/codea_skinner33_11.call @@ -14,14 +14,14 @@ RET(f1(0, 3, 20) == F1( 3, 20) && f2(0, 50, -9) == F2( 50, -9) && f2(0, -77, -50) == F2( -77, -50) && - f1(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F1(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f2(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F2(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && + f1(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F1(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f2(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F2(0x7FFFFFFFUL, 0x7FFFFFFFUL) && - f1(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F1(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f2(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F2(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) + f1(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F1(0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f2(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F2(0x8FFFFFFFUL, 0x8FFFFFFFUL) ); diff --git a/gesamt_ppc/codea_skinner33_12.call b/gesamt_ppc/codea_skinner33_12.call index f18e5a2..7954f84 100644 --- a/gesamt_ppc/codea_skinner33_12.call +++ b/gesamt_ppc/codea_skinner33_12.call @@ -14,14 +14,14 @@ RET(f1(0, 3, 20) == F1( 3, 20) && f2(0, 50, -9) == F2( 50, -9) && f2(0, -77, -50) == F2( -77, -50) && - f1(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F1(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f2(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F2(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && + f1(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F1(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f2(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F2(0x7FFFFFFFUL, 0x7FFFFFFFUL) && - f1(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F1(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f2(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F2(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) + f1(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F1(0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f2(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F2(0x8FFFFFFFUL, 0x8FFFFFFFUL) ); diff --git a/gesamt_ppc/codea_skinner33_13.call b/gesamt_ppc/codea_skinner33_13.call index 77dace7..83955d4 100644 --- a/gesamt_ppc/codea_skinner33_13.call +++ b/gesamt_ppc/codea_skinner33_13.call @@ -14,14 +14,14 @@ RET(f1(0, 3, 20) == F1( 3, 20) && f2(0, 50, -9) == F2( 50, -9) && f2(0, -77, -50) == F2( -77, -50) && - f1(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F1(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f2(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F2(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && + f1(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F1(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f2(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F2(0x7FFFFFFFUL, 0x7FFFFFFFUL) && - f1(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F1(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f2(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F2(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) + f1(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F1(0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f2(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F2(0x8FFFFFFFUL, 0x8FFFFFFFUL) ); diff --git a/gesamt_ppc/codea_skinner33_14.call b/gesamt_ppc/codea_skinner33_14.call index 714f7bd..4c1efee 100644 --- a/gesamt_ppc/codea_skinner33_14.call +++ b/gesamt_ppc/codea_skinner33_14.call @@ -14,14 +14,14 @@ RET(f1(0, 3, 20) == F1( 3, 20) && f2(0, 50, -9) == F2( 50, -9) && f2(0, -77, -50) == F2( -77, -50) && - f1(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F1(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && - f2(0, 0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) == - F2(0x7FFFFFFFFFFFFFFFUL, 0x7FFFFFFFFFFFFFFFUL) && + f1(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F1(0x7FFFFFFFUL, 0x7FFFFFFFUL) && + f2(0, 0x7FFFFFFFUL, 0x7FFFFFFFUL) == + F2(0x7FFFFFFFUL, 0x7FFFFFFFUL) && - f1(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F1(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) && - f2(0, 0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) == - F2(0x8FFFFFFFFFFFFFFFUL, 0x8FFFFFFFFFFFFFFFUL) + f1(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F1(0x8FFFFFFFUL, 0x8FFFFFFFUL) && + f2(0, 0x8FFFFFFFUL, 0x8FFFFFFFUL) == + F2(0x8FFFFFFFUL, 0x8FFFFFFFUL) ); diff --git a/gesamt_ppc/codea_skinner33_21.0 b/gesamt_ppc/codea_skinner33_21.0 index 6078010..0977c73 100644 --- a/gesamt_ppc/codea_skinner33_21.0 +++ b/gesamt_ppc/codea_skinner33_21.0 @@ -1,5 +1,5 @@ struct a b c end; method m(x) - return ((this-0)-8).c; + return ((this-0)-4).c; end; diff --git a/gesamt_ppc/codeb_georg_fib_043.0 b/gesamt_ppc/codeb_georg_fib_043.0 index 4db524a..d37fd0e 100644 --- a/gesamt_ppc/codeb_georg_fib_043.0 +++ b/gesamt_ppc/codeb_georg_fib_043.0 @@ -10,13 +10,13 @@ method fib(x) var t := this; if x < 0 then return -1; end; t.f0 := 0; if x < 1 then return f0; end; t.f1 := 1; - if x < 2 then return f1; end; t.f2 := t.f0-(0-t.f1); t := t--8; - if x < 3 then return f2; end; t.f2 := t.f0-(0-t.f1); t := t--8; - if x < 4 then return f3; end; t.f2 := t.f0-(0-t.f1); t := t--8; - if x < 5 then return f4; end; t.f2 := t.f0-(0-t.f1); t := t--8; - if x < 6 then return f5; end; t.f2 := t.f0-(0-t.f1); t := t--8; - if x < 7 then return f6; end; t.f2 := t.f0-(0-t.f1); t := t--8; - if x < 8 then return f7; end; t.f2 := t.f0-(0-t.f1); t := t--8; - if x < 9 then return f8; end; t.f2 := t.f0-(0-t.f1); t := t--8; + if x < 2 then return f1; end; t.f2 := t.f0-(0-t.f1); t := t--4; + if x < 3 then return f2; end; t.f2 := t.f0-(0-t.f1); t := t--4; + if x < 4 then return f3; end; t.f2 := t.f0-(0-t.f1); t := t--4; + if x < 5 then return f4; end; t.f2 := t.f0-(0-t.f1); t := t--4; + if x < 6 then return f5; end; t.f2 := t.f0-(0-t.f1); t := t--4; + if x < 7 then return f6; end; t.f2 := t.f0-(0-t.f1); t := t--4; + if x < 8 then return f7; end; t.f2 := t.f0-(0-t.f1); t := t--4; + if x < 9 then return f8; end; t.f2 := t.f0-(0-t.f1); t := t--4; return f9; end; diff --git a/gesamt_ppc/codeb_georg_fib_044.0 b/gesamt_ppc/codeb_georg_fib_044.0 index c8e1a16..ab90c9b 100644 --- a/gesamt_ppc/codeb_georg_fib_044.0 +++ b/gesamt_ppc/codeb_georg_fib_044.0 @@ -17,8 +17,8 @@ method fib(x) while not (x < 2) do t.c := t.a-(0-t.b); - t := t--8; + t := t--4; x := x-1; end; - return (t-8).c; + return (t-4).c; end; diff --git a/gesamt_ppc/codeb_intelli_02.call b/gesamt_ppc/codeb_intelli_02.call index f4b6a3d..c1343e9 100644 --- a/gesamt_ppc/codeb_intelli_02.call +++ b/gesamt_ppc/codeb_intelli_02.call @@ -1,5 +1,5 @@ -extern long a(long long this); -extern long b(long long this); +extern long a(int this); +extern long b(int this); RET(a(20) == -7 && b(0xDEAD) == 20); diff --git a/gesamt_ppc/codeb_intelli_03.call b/gesamt_ppc/codeb_intelli_03.call index a9c4795..1e75a43 100644 --- a/gesamt_ppc/codeb_intelli_03.call +++ b/gesamt_ppc/codeb_intelli_03.call @@ -1,6 +1,6 @@ -extern long a(long long *this); -extern long b(long long this, long long *a); +extern long a(int *this); +extern long b(int this, int *a); -long long ar[3] = { 2, 4, 8 }; +int ar[3] = { 2, 4, 8 }; RET(a(ar) == -4711 && b(0xDEAD, ar) == 16); diff --git a/gesamt_ppc/codeb_intelli_04.call b/gesamt_ppc/codeb_intelli_04.call index 130f710..eddb611 100644 --- a/gesamt_ppc/codeb_intelli_04.call +++ b/gesamt_ppc/codeb_intelli_04.call @@ -1,6 +1,6 @@ -extern long a(long long *this); +extern long a(int *this); -long long ar[3] = { 2, 4, 8 }; +int ar[3] = { 2, 4, 8 }; RET(a(ar) == 815 && ar[0] == 815); diff --git a/gesamt_ppc/codeb_intelli_05.call b/gesamt_ppc/codeb_intelli_05.call index fb14422..4c5ad1e 100644 --- a/gesamt_ppc/codeb_intelli_05.call +++ b/gesamt_ppc/codeb_intelli_05.call @@ -1,6 +1,6 @@ -extern long a(long long *this); +extern long a(int *this); -long long ar[3] = { 2, 4, 8 }; +int ar[3] = { 2, 4, 8 }; -RET(a(ar) == 3260 && ar[2] == 3260 && ar[0] == 815); \ No newline at end of file +RET(a(ar) == 3260 && ar[2] == 3260 && ar[0] == 815); diff --git a/gesamt_ppc/codeb_intelli_06.call b/gesamt_ppc/codeb_intelli_06.call index 6f32852..da22ab9 100644 --- a/gesamt_ppc/codeb_intelli_06.call +++ b/gesamt_ppc/codeb_intelli_06.call @@ -1,5 +1,5 @@ -extern long long* b(long long this, long long *a); +extern int* b(int this, int *a); -long long ar[3] = { 2, 4, 8 }; +int ar[3] = { 2, 4, 8 }; RET(b(0xDEAD, ar) == ar && ar[0] == 3 && ar[1] == 2 && ar[2] == -4); diff --git a/gesamt_ppc/codeb_intelli_07.call b/gesamt_ppc/codeb_intelli_07.call index d66845c..9b42641 100644 --- a/gesamt_ppc/codeb_intelli_07.call +++ b/gesamt_ppc/codeb_intelli_07.call @@ -1,5 +1,5 @@ -extern long long m(long long *this, long long x); +extern int m(int *this, int x); -long long ar[3] = { 2, 4, 8 }; +int ar[3] = { 2, 4, 8 }; RET(m(ar, 12) == 188 && ar[0] == 1 && ar[1] == 4 && ar[2] == 8); diff --git a/gesamt_ppc/codeb_intelli_08.call b/gesamt_ppc/codeb_intelli_08.call index 5d374dc..814ab91 100644 --- a/gesamt_ppc/codeb_intelli_08.call +++ b/gesamt_ppc/codeb_intelli_08.call @@ -1,3 +1,3 @@ -extern long long m(long long this); +extern int m(int this); -RET(m(9) == 3 && m(10) == 0); \ No newline at end of file +RET(m(9) == 3 && m(10) == 0); diff --git a/gesamt_ppc/codeb_intelli_09.call b/gesamt_ppc/codeb_intelli_09.call index 372469e..c9d6e72 100644 --- a/gesamt_ppc/codeb_intelli_09.call +++ b/gesamt_ppc/codeb_intelli_09.call @@ -1,3 +1,3 @@ -extern long long m(long long this, long long a); +extern int m(int this, int a); -RET(m(51, 0) == 10 && m(-3, 5) == 30 && m(35, 18) == 8); \ No newline at end of file +RET(m(51, 0) == 10 && m(-3, 5) == 30 && m(35, 18) == 8); diff --git a/gesamt_ppc/codeb_intelli_10.call b/gesamt_ppc/codeb_intelli_10.call index 39c3e6d..85ee6ef 100644 --- a/gesamt_ppc/codeb_intelli_10.call +++ b/gesamt_ppc/codeb_intelli_10.call @@ -1,3 +1,7 @@ -extern long long m(long long this, long long a); +extern int m(int this, int a); -RET(m(60, 0) == 10 && m(0, 10) == 200 && m(35, 18) == 8 && m(-10, 0) == 840); \ No newline at end of file +printf("m(60,0): %d(10)\n", m(60,0)); +printf("m(0,10): %d(200)\n", m(0,10)); +printf("m(35,18): %d(8)\n", m(35,18)); +printf("m(-10,0): %d(840)\n", m(-10,0)); +RET(m(60, 0) == 10 && m(0, 10) == 200 && m(35, 18) == 8 && m(-10, 0) == 840); diff --git a/gesamt_ppc/codeb_intelli_11.call b/gesamt_ppc/codeb_intelli_11.call index 3a71fea..e06d3b0 100644 --- a/gesamt_ppc/codeb_intelli_11.call +++ b/gesamt_ppc/codeb_intelli_11.call @@ -1,3 +1,3 @@ -extern long long m(long long this); +extern int m(int this); -RET(m(0xCCACC) == 10); \ No newline at end of file +RET(m(0xCCACC) == 10); diff --git a/gesamt_ppc/codeb_intelli_12.call b/gesamt_ppc/codeb_intelli_12.call index 1f1c37a..4bb475a 100644 --- a/gesamt_ppc/codeb_intelli_12.call +++ b/gesamt_ppc/codeb_intelli_12.call @@ -1,4 +1,4 @@ -extern long long m(long long this); +extern int m(int this); RET(m(-2) == 7 && m(-1) == 5); diff --git a/gesamt_ppc/codeb_intelli_13.call b/gesamt_ppc/codeb_intelli_13.call index bb251ad..15648e3 100644 --- a/gesamt_ppc/codeb_intelli_13.call +++ b/gesamt_ppc/codeb_intelli_13.call @@ -1,3 +1,3 @@ -extern long long m(long long this); +extern int m(int this); -RET(m(0xBABE) == 0); \ No newline at end of file +RET(m(0xBABE) == 0); diff --git a/gesamt_ppc/codeb_intelli_14.0 b/gesamt_ppc/codeb_intelli_14.0 index b1b91cc..590c872 100644 --- a/gesamt_ppc/codeb_intelli_14.0 +++ b/gesamt_ppc/codeb_intelli_14.0 @@ -4,11 +4,11 @@ method m(s) var i := 0; var sum := 0; while i < s do - (this - (-8 * i)).x := (this - (-8 * i)).x * 10; - if (this - (-8 * i)).x = 47110 then - (this - (-8 * i)).x := 0815; + (this - (-4 * i)).x := (this - (-4 * i)).x * 10; + if (this - (-4 * i)).x = 47110 then + (this - (-4 * i)).x := 0815; end; - sum := sum - ((this - (-8 * i)).x * -1); + sum := sum - ((this - (-4 * i)).x * -1); i := i - (-1); end; return sum; diff --git a/gesamt_ppc/codeb_intelli_14.call b/gesamt_ppc/codeb_intelli_14.call index d3fedd8..cc77a91 100644 --- a/gesamt_ppc/codeb_intelli_14.call +++ b/gesamt_ppc/codeb_intelli_14.call @@ -1,7 +1,7 @@ -extern long long m(long long *this, long long s); +extern int m(int *this, int s); -long long ar[] = { 1, 2, 3, 4}; -long long ar2[] = { -7, 4711, 3, 4}; +int ar[] = { 1, 2, 3, 4}; +int ar2[] = { -7, 4711, 3, 4}; RET(m(ar, 3) == 60 && ar[0] == 10 && ar[1] == 20 && ar[2] == 30 && ar[3] == 4 && m(ar2, 2) == 745 && ar2[0] == -70 && ar2[1] == 815 && ar2[2] == 3); diff --git a/gesamt_ppc/codeb_intelli_15.0 b/gesamt_ppc/codeb_intelli_15.0 index 7ed79aa..0f789d9 100644 --- a/gesamt_ppc/codeb_intelli_15.0 +++ b/gesamt_ppc/codeb_intelli_15.0 @@ -6,9 +6,9 @@ method m1(size) var i:= 0; while not (i = size) do if i < 1 then - (this - (i * -8)).x := (this - (i * -8)).x - (-20); + (this - (i * -4)).x := (this - (i * -4)).x - (-20); else - (this - (i * -8)).x := (this - ((i - 1) * -8)).x or 128; + (this - (i * -4)).x := (this - ((i - 1) * -4)).x or 128; end; i := i - -1; end; diff --git a/gesamt_ppc/codeb_intelli_15.call b/gesamt_ppc/codeb_intelli_15.call index a004b8d..edb221c 100644 --- a/gesamt_ppc/codeb_intelli_15.call +++ b/gesamt_ppc/codeb_intelli_15.call @@ -1,7 +1,7 @@ -extern long long m1(long long *this, long long size); -extern long long m2(long long this, long long y); +extern int m1(int *this, int size); +extern int m2(int this, int y); -long long ar[] = { 2, 4, 8, 16, 32 }; +int ar[] = { 2, 4, 8, 16, 32 }; RET(m1(ar, 3) == -20 && ar[0] == 22 && ar[1] == 150 && ar[2] == 150 && -m2(0xABC, 101) == 0 && m2(0xABC, -5) == -20 && m2(0xABC, 100) == 320); \ No newline at end of file +m2(0xABC, 101) == 0 && m2(0xABC, -5) == -20 && m2(0xABC, 100) == 320); diff --git a/gesamt_ppc/skinner33_02.call b/gesamt_ppc/skinner33_02.call index 5de0e00..2114388 100644 --- a/gesamt_ppc/skinner33_02.call +++ b/gesamt_ppc/skinner33_02.call @@ -1,7 +1,7 @@ -extern long long m(long long* ar1, long long *ar2); +extern int m(int* ar1, int *ar2); -long long z1[] = { 0, 2, 4, 6, 8, 10, 12 }; -long long z2[] = { 10, 20, 40, 60, 80, 100, 120 }; +int z1[] = { 0, 2, 4, 6, 8, 10, 12 }; +int z2[] = { 10, 20, 40, 60, 80, 100, 120 }; int i; @@ -11,7 +11,7 @@ for(i=0; i < sizeof z1/sizeof z1[0]; i++) { printf("z1[%i]: %ld, z2[%i]: %ld\n", i, z1[i], i, z2[i]); } -long long ret = m(&z1[1], &z2[1]); +int ret = m(&z1[1], &z2[1]); printf("ret: %ld\n", ret); for(i=0; i < sizeof z1/sizeof z1[0]; i++) { diff --git a/scripts/debug_gesamt_ppc b/scripts/debug_gesamt_ppc new file mode 100755 index 0000000..eaf1206 --- /dev/null +++ b/scripts/debug_gesamt_ppc @@ -0,0 +1,73 @@ +#!/bin/bash + +i=$1 +beispiel=gesamt_ppc +PROGRAM=./$beispiel + +#LOC=. +#LOC=/usr/ftp/pub/ubvl/test/$beispiel +LOC=~/test/scripts + +allow_null_glob_expansion=1 + +if [ ! -d ~/abgabe/$beispiel ]; then + echo "Fehler: Verzeichnis ~/abgabe/$beispiel existiert nicht." + exit 1 +else + cd ~/abgabe/$beispiel + echo 'Teste "make"' + make +fi + +if test ! -x $PROGRAM +then + echo "Fehler: Kein Programm $PROGRAM" + exit 1 +fi +let prgnum=0 +#for i in $LOC/*.0 $LOC2/*.0 +if [ -f $i ]; then + let prgnum=prgnum+1 + let errorfound=0 + echo "==========> Eingabe von $i:" + cat $i + echo + RESFILE=test${beispiel}out$$ + $PROGRAM <$i >$RESFILE + retval=$? + echo -n "Übersetzung: " + if test $retval -eq 0 + then + echo "Status korrekt" + else + echo "[Errot] Status=$retval. Erwartet: 0" + let errorfound=1 + fi + echo + echo "Ausgabe:" + if [ -f ~/test/scripts/clr.py ]; then + cat $RESFILE | ~/test/scripts/clr.py + else + cat $RESFILE + fi + mv -f $RESFILE $RESFILE.s + CALLFILE=${i%.*}.call + echo + if [ ! -f $CALLFILE ]; then + echo "Fehler: Datei $CALLFILE existiert nicht, kann Code nicht ausführen..." + exit 1 + else + echo "Übersetze und linke das Testprogramm:" + if cc -g -I. -DCALL=\"$CALLFILE\" $LOC/testmain.c $LOC/callingconvention.o $RESFILE.s; then + echo + echo "Rufe folgendes Codefragment auf:" + cat $CALLFILE + echo + gdb ./a.out + else + echo "[Error] Erzeugter Code konnte nicht assembliert und gelinkt werden." + let errorfound=1 + fi + fi + rm -f a.out $RESFILE $RESFILE.s +fi diff --git a/scripts/modlvatest_gesamt_ppc.sh b/scripts/modlvatest_gesamt_ppc.sh index dd64ac0..dabfb35 100755 --- a/scripts/modlvatest_gesamt_ppc.sh +++ b/scripts/modlvatest_gesamt_ppc.sh @@ -52,11 +52,11 @@ do fi echo echo "Ausgabe:" - if [ -f ~/test/scripts/clr.py ]; then - cat $RESFILE | ~/test/scripts/clr.py - else + #if [ -f ~/test/scripts/clr.py ]; then + # cat $RESFILE | ~/test/scripts/clr.py + #else cat $RESFILE - fi + #fi mv -f $RESFILE $RESFILE.s CALLFILE=${i%.*}.call echo -- 2.25.1