diff --git a/src/TestData.h b/src/TestData.h index 51538a0a..a0e89055 100644 --- a/src/TestData.h +++ b/src/TestData.h @@ -80,7 +80,6 @@ typedef struct { bool i386_unknown_linux2_4; bool _i386_unknown_nt4_0_test; bool _x86_64_unknown_linux2_4; - bool _rs6000_ibm_aix5_1; } platforms_t; struct TESTLIB_DLL_EXPORT TestData { diff --git a/src/dyninst/dyninst_comp.C b/src/dyninst/dyninst_comp.C index 5d157633..78700c00 100644 --- a/src/dyninst/dyninst_comp.C +++ b/src/dyninst/dyninst_comp.C @@ -804,13 +804,6 @@ void addLibArchExt(char *dest, unsigned int dest_max_len, int psize) dest_len = strlen(dest); // Patch up alternate ABI filenames -#if defined(rs6000_ibm_aix64_test) - if(psize == 4) { - strncat(dest, "_32", dest_max_len - dest_len); - dest_len += 3; - } -#endif - #if defined(arch_x86_64_test) if (psize == 4) { strncat(dest,"_m32", dest_max_len - dest_len); @@ -828,7 +821,7 @@ void addLibArchExt(char *dest, unsigned int dest_max_len, int psize) } int pointerSize(BPatch_image *img) { -#if defined(mips_sgi_irix6_4_test) || defined(arch_x86_64_test) +#if defined(arch_x86_64_test) BPatch_variableExpr *pointerSizeVar = img->findVariable("pointerSize"); if (!pointerSizeVar) { @@ -1201,14 +1194,6 @@ int instCall(BPatch_addressSpace* as, const char* fname, BPatch_funcCallExpr countXXXCall(*countXXXFunc, callArgs); for(unsigned int i=0;i<(*res).size();i++){ - -#if defined(os_aix_test) - const BPatch_memoryAccess* memAccess; - memAccess = (*res)[i]->getMemoryAccess() ; - - whenToCall = instrumentWhere( memAccess); - -#endif as->insertSnippet(countXXXCall, *((*res)[i]),whenToCall); } @@ -1240,13 +1225,6 @@ int instEffAddr(BPatch_addressSpace* as, const char* fname, BPatch_callWhen whenToCall = BPatch_callBefore; for(unsigned int i=0;i<(*res).size();i++){ -#if defined(os_aix_test) - const BPatch_memoryAccess* memAccess; - - memAccess = (*res)[i]->getMemoryAccess() ; - - whenToCall = instrumentWhere( memAccess); -#endif BPatch_Vector listArgs; BPatch_effectiveAddressExpr eae; BPatch_constExpr insn_str((*res)[i]->getInsnAtPoint().format().c_str()); @@ -1324,14 +1302,6 @@ int instByteCnt(BPatch_addressSpace* as, const char* fname, for(unsigned int i=0;i<(*res).size();i++){ BPatch_Vector listArgs; - -#if defined(os_aix_test) - const BPatch_memoryAccess* memAccess; - memAccess = (*res)[i]->getMemoryAccess() ; - - whenToCall = instrumentWhere( memAccess); - -#endif BPatch_bytesAccessedExpr bae; std::string insn = (*res)[i]->getInsnAtPoint().format(); BPatch_constExpr insn_str(insn.c_str()); diff --git a/src/dyninst/libLoadMe.c b/src/dyninst/libLoadMe.c index 7e843f96..8263f121 100644 --- a/src/dyninst/libLoadMe.c +++ b/src/dyninst/libLoadMe.c @@ -38,8 +38,6 @@ extern int globalVariable5_1; _init table of methods: GCC: link with gcc -shared, and use __attribute__((constructor)); - AIX: ld with -binitfini:loadMe_init - Solaris: ld with -z initarray=loadMe_init Linux: ld with -init loadMe_init gcc with -Wl,-init -Wl,... diff --git a/src/dyninst/test1_10F_fortran.F b/src/dyninst/test1_10F_fortran.F index 69860e0b..8c579896 100644 --- a/src/dyninst/test1_10F_fortran.F +++ b/src/dyninst/test1_10F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_10F_mutatee.c b/src/dyninst/test1_10F_mutatee.c index 083a27ee..ed6e2167 100644 --- a/src/dyninst/test1_10F_mutatee.c +++ b/src/dyninst/test1_10F_mutatee.c @@ -46,11 +46,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_10_func1 test1_10_func1_ #define test1_10f_init_globals test1_10f_init_globals_ #define test1_10f_globals test1_10f_globals_ -#endif extern struct block_ test1_10f_globals; diff --git a/src/dyninst/test1_11F_fortran.F b/src/dyninst/test1_11F_fortran.F index 95204a6e..f688e95f 100644 --- a/src/dyninst/test1_11F_fortran.F +++ b/src/dyninst/test1_11F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_11F_mutatee.c b/src/dyninst/test1_11F_mutatee.c index d93a97d0..945988db 100644 --- a/src/dyninst/test1_11F_mutatee.c +++ b/src/dyninst/test1_11F_mutatee.c @@ -46,11 +46,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_11_func1 test1_11_func1_ #define test1_11f_init_globals test1_11f_init_globals_ #define test1_11f_globals test1_11f_globals_ -#endif extern struct block_ test1_11f_globals; diff --git a/src/dyninst/test1_12F_fortran.F b/src/dyninst/test1_12F_fortran.F index eb499bb9..386137be 100644 --- a/src/dyninst/test1_12F_fortran.F +++ b/src/dyninst/test1_12F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_12F_mutatee.c b/src/dyninst/test1_12F_mutatee.c index c079c50f..0cd5a71e 100644 --- a/src/dyninst/test1_12F_mutatee.c +++ b/src/dyninst/test1_12F_mutatee.c @@ -46,11 +46,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define func12_1 func12_1_ #define init_globals init_globals_ #define globals globals_ -#endif extern struct block_ globals; diff --git a/src/dyninst/test1_13F_fortran.F b/src/dyninst/test1_13F_fortran.F index 67cd5ba7..4f68f456 100644 --- a/src/dyninst/test1_13F_fortran.F +++ b/src/dyninst/test1_13F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_13F_mutatee.c b/src/dyninst/test1_13F_mutatee.c index 1fcf471b..44828fbd 100644 --- a/src/dyninst/test1_13F_mutatee.c +++ b/src/dyninst/test1_13F_mutatee.c @@ -46,11 +46,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_13_func1 test1_13_func1_ #define test1_13f_init_globals test1_13f_init_globals_ #define test1_13f_globals test1_13f_globals_ -#endif extern struct block_ test1_13f_globals; diff --git a/src/dyninst/test1_14F_fortran.F b/src/dyninst/test1_14F_fortran.F index d1f7b55e..467f789a 100644 --- a/src/dyninst/test1_14F_fortran.F +++ b/src/dyninst/test1_14F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_14F_mutatee.c b/src/dyninst/test1_14F_mutatee.c index adea5c8b..6a462db5 100644 --- a/src/dyninst/test1_14F_mutatee.c +++ b/src/dyninst/test1_14F_mutatee.c @@ -46,11 +46,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_14_func1 test1_14_func1_ #define test1_14f_init_globals test1_14f_init_globals_ #define test1_14f_globals test1_14f_globals_ -#endif extern struct block_ test1_14f_globals; diff --git a/src/dyninst/test1_16F_fortran.F b/src/dyninst/test1_16F_fortran.F index 5182420b..725b265d 100644 --- a/src/dyninst/test1_16F_fortran.F +++ b/src/dyninst/test1_16F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_16F_mutatee.c b/src/dyninst/test1_16F_mutatee.c index a767036f..213c25fc 100644 --- a/src/dyninst/test1_16F_mutatee.c +++ b/src/dyninst/test1_16F_mutatee.c @@ -47,11 +47,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_16_func1 test1_16_func1_ #define test1_16f_init_globals test1_16f_init_globals_ #define test1_16f_globals test1_16f_globals_ -#endif extern struct block_ test1_16f_globals; diff --git a/src/dyninst/test1_17F_fortran.F b/src/dyninst/test1_17F_fortran.F index 8acc381a..4ca0887f 100644 --- a/src/dyninst/test1_17F_fortran.F +++ b/src/dyninst/test1_17F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_17F_mutatee.c b/src/dyninst/test1_17F_mutatee.c index 20afd2df..13deb321 100644 --- a/src/dyninst/test1_17F_mutatee.c +++ b/src/dyninst/test1_17F_mutatee.c @@ -46,11 +46,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_17_func1 test1_17_func1_ #define test1_17f_init_globals test1_17f_init_globals_ #define test1_17f_globals test1_17f_globals_ -#endif extern struct block_ test1_17f_globals; diff --git a/src/dyninst/test1_18F_fortran.F b/src/dyninst/test1_18F_fortran.F index 9863fefb..e7ad8596 100644 --- a/src/dyninst/test1_18F_fortran.F +++ b/src/dyninst/test1_18F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_18F_mutatee.c b/src/dyninst/test1_18F_mutatee.c index f768030c..1c4132dc 100644 --- a/src/dyninst/test1_18F_mutatee.c +++ b/src/dyninst/test1_18F_mutatee.c @@ -47,11 +47,9 @@ struct block_ { int kludge; }; -#if !defined(XLF) #define test1_18_func1 test1_18_func1_ #define test1_18f_init_globals test1_18f_init_globals_ #define test1_18f_globals test1_18f_globals_ -#endif extern struct block_ test1_18f_globals; diff --git a/src/dyninst/test1_19F_fortran.F b/src/dyninst/test1_19F_fortran.F index 9af1775b..4f8dc3e6 100644 --- a/src/dyninst/test1_19F_fortran.F +++ b/src/dyninst/test1_19F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_19F_mutatee.c b/src/dyninst/test1_19F_mutatee.c index b68bdb1d..cd4e4a98 100644 --- a/src/dyninst/test1_19F_mutatee.c +++ b/src/dyninst/test1_19F_mutatee.c @@ -47,11 +47,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define func19_1 func19_1_ #define test1_19f_init_globals test1_19f_init_globals_ #define test1_19f_globals test1_19f_globals_ -#endif extern struct block_ test1_19f_globals; diff --git a/src/dyninst/test1_1F_fortran.F b/src/dyninst/test1_1F_fortran.F index 0c6cf8fa..25c42bdc 100644 --- a/src/dyninst/test1_1F_fortran.F +++ b/src/dyninst/test1_1F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_1F_mutatee.c b/src/dyninst/test1_1F_mutatee.c index 51c7be87..4cdb3e29 100644 --- a/src/dyninst/test1_1F_mutatee.c +++ b/src/dyninst/test1_1F_mutatee.c @@ -47,11 +47,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_1_func1_1 test1_1_func1_1_ #define test1_1f_init_globals test1_1f_init_globals_ #define test1_1f_globals test1_1f_globals_ -#endif extern struct block_ test1_1f_globals; diff --git a/src/dyninst/test1_20F_fortran.F b/src/dyninst/test1_20F_fortran.F index a2c5aa2d..b2a59e0c 100644 --- a/src/dyninst/test1_20F_fortran.F +++ b/src/dyninst/test1_20F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_20F_mutatee.c b/src/dyninst/test1_20F_mutatee.c index 6797d09c..39b9e147 100644 --- a/src/dyninst/test1_20F_mutatee.c +++ b/src/dyninst/test1_20F_mutatee.c @@ -47,11 +47,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define func20_1 func20_1_ #define test1_20f_init_globals test1_20f_init_globals_ #define test1_20f_globals test1_20f_globals_ -#endif extern struct block_ test1_20f_globals; diff --git a/src/dyninst/test1_21.C b/src/dyninst/test1_21.C index 8a8b0cae..a9a515bf 100644 --- a/src/dyninst/test1_21.C +++ b/src/dyninst/test1_21.C @@ -83,8 +83,7 @@ extern "C" DLLEXPORT TestMutator *test1_21_factory() test_results_t test1_21_Mutator::mutatorTest21() { -#if defined(os_aix_test) \ - || defined(os_linux_test) \ +#if defined(os_linux_test) \ || defined(os_windows_test) \ || defined(os_freebsd_test) diff --git a/src/dyninst/test1_21_mutatee.c b/src/dyninst/test1_21_mutatee.c index db9cc79b..3fd41317 100644 --- a/src/dyninst/test1_21_mutatee.c +++ b/src/dyninst/test1_21_mutatee.c @@ -55,8 +55,7 @@ int test1_21_mutatee() { /* Nothing for the mutatee to do in this test (findFunction in module) */ -#if defined(os_aix_test) \ - || defined(os_linux_test) \ +#if defined(os_linux_test) \ || defined(os_windows_test) logerror("Passed test #21 (findFunction in module)\n"); test_passes(testname); diff --git a/src/dyninst/test1_22_mutatee.c b/src/dyninst/test1_22_mutatee.c index 69ed7002..d86db9cb 100644 --- a/src/dyninst/test1_22_mutatee.c +++ b/src/dyninst/test1_22_mutatee.c @@ -29,7 +29,6 @@ */ #if defined(i386_unknown_linux2_0_test) \ || defined(x86_64_unknown_linux2_4_test) /* Blind duplication - Ray */ \ - || defined(os_aix_test) \ || defined(os_linux_test) \ || defined(os_freebsd_test) /* better off using os #defines than whole platforms */ #include /* For replaceFunction test */ diff --git a/src/dyninst/test1_23.C b/src/dyninst/test1_23.C index 125ce72a..3a36f562 100644 --- a/src/dyninst/test1_23.C +++ b/src/dyninst/test1_23.C @@ -32,7 +32,6 @@ /* * #Name: test1_23 * #Desc: Local Variables - * #Dep: !mips_sgi_irix6_4_test * #Notes: */ diff --git a/src/dyninst/test1_23_mutatee.c b/src/dyninst/test1_23_mutatee.c index 49cae0b0..2d568500 100644 --- a/src/dyninst/test1_23_mutatee.c +++ b/src/dyninst/test1_23_mutatee.c @@ -66,13 +66,6 @@ static int test_failed = FALSE; * Test #23 - local variables */ int test1_23_mutatee() { -/* We don't support MIPS any more, so we don't need to check for it - * #if defined(mips_sgi_irix6_4_test) - * logerror("Skipped test #23 (local variables)\n"); - * logerror("\t- not implemented on this platform\n"); - * passedTest[23] = TRUE; - * #else - */ int retval; test1_23_call1(); @@ -85,7 +78,6 @@ int test1_23_mutatee() { retval = -1; /* Test failed */ } return retval; -/* #endif */ } void verifyScalarValue23(const char *name, int a, int value) diff --git a/src/dyninst/test1_24.C b/src/dyninst/test1_24.C index c8bf532c..858506f2 100644 --- a/src/dyninst/test1_24.C +++ b/src/dyninst/test1_24.C @@ -66,8 +66,7 @@ test_results_t test1_24_Mutator::executeTest() } // This test is skipped on some (no?) platforms -#if !defined(rs6000_ibm_aix4_1_test) \ - && !defined(i386_unknown_linux2_0_test) \ +#if !defined(i386_unknown_linux2_0_test) \ && !defined(x86_64_unknown_linux2_4_test) /* Blind duplication - Ray */ \ && !defined(i386_unknown_nt4_0_test) \ && !defined(os_linux_test) /* Use OS #define instead of platform - Greg */ \ diff --git a/src/dyninst/test1_24_mutatee.c b/src/dyninst/test1_24_mutatee.c index 3aeae06d..ee588538 100644 --- a/src/dyninst/test1_24_mutatee.c +++ b/src/dyninst/test1_24_mutatee.c @@ -82,8 +82,7 @@ int test1_24_mutatee() { int i, j; int retval; -#if !defined(rs6000_ibm_aix4_1_test) \ - && !defined(i386_unknown_linux2_0_test) \ +#if !defined(i386_unknown_linux2_0_test) \ && !defined(x86_64_unknown_linux2_4_test) /* Blind duplication - Ray */ \ && !defined(i386_unknown_nt4_0_test) \ && !defined(os_freebsd_test) \ diff --git a/src/dyninst/test1_25.C b/src/dyninst/test1_25.C index 285f8c03..f8e20689 100644 --- a/src/dyninst/test1_25.C +++ b/src/dyninst/test1_25.C @@ -103,8 +103,7 @@ test_results_t test1_25_Mutator::executeTest() } // globalVariable25_2 = &globalVariable25_1 -#if !defined(rs6000_ibm_aix4_1_test) \ - && !defined(i386_unknown_linux2_0_test) \ +#if !defined(i386_unknown_linux2_0_test) \ && !defined(x86_64_unknown_linux2_4_test) /* Blind duplication - Ray */ \ && !defined(ppc64_linux_test) \ && !defined(i386_unknown_nt4_0_test) \ @@ -138,9 +137,6 @@ test_results_t test1_25_Mutator::executeTest() BPatch_arithExpr(BPatch_negate, *gvar[6])); appAddrSpace->insertSnippet(assignment4, *point25_1); - // Check removed because MIPS is no longer supported - // #endif // !MIPS - BPatch::bpatch->setTypeChecking (true); return PASSED; } diff --git a/src/dyninst/test1_25F_fortran.F b/src/dyninst/test1_25F_fortran.F index 46874a1a..2a1dd905 100644 --- a/src/dyninst/test1_25F_fortran.F +++ b/src/dyninst/test1_25F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_25F_mutatee.c b/src/dyninst/test1_25F_mutatee.c index 377b4e98..9503212c 100644 --- a/src/dyninst/test1_25F_mutatee.c +++ b/src/dyninst/test1_25F_mutatee.c @@ -47,11 +47,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define func25_1 func25_1_ #define test1_25f_init_globals test1_25f_init_globals_ #define test1_25f_globals test1_25f_globals_ -#endif extern struct block_ test1_25f_globals; diff --git a/src/dyninst/test1_26F_fortran.F b/src/dyninst/test1_26F_fortran.F index 3c36b8af..6058fd88 100644 --- a/src/dyninst/test1_26F_fortran.F +++ b/src/dyninst/test1_26F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_26F_mutatee.c b/src/dyninst/test1_26F_mutatee.c index a63b4554..610fa746 100644 --- a/src/dyninst/test1_26F_mutatee.c +++ b/src/dyninst/test1_26F_mutatee.c @@ -62,11 +62,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define func26_1 func26_1_ #define test1_26f_init_globals test1_26f_init_globals_ #define test1_26f_globals test1_26f_globals_ -#endif extern struct block_ test1_26f_globals; diff --git a/src/dyninst/test1_27_mutatee.c b/src/dyninst/test1_27_mutatee.c index 1d99a9bf..b1732ad6 100644 --- a/src/dyninst/test1_27_mutatee.c +++ b/src/dyninst/test1_27_mutatee.c @@ -103,7 +103,7 @@ typedef struct { struct struct26_2 field4; } test1_27_type4; #endif -/* need this variables or some compilers (AIX xlc) will removed unused +/* need this variables or some compilers will removed unused typedefs - jkh 10/13/99 */ test1_27_type1 test1_27_dummy1; test1_27_type2 test1_27_dummy2; @@ -112,8 +112,6 @@ test1_27_type4 test1_27_dummy4; int test1_27_globalVariable1 = -1; -/* Note for future reference: -Wl,-bgcbypass:3 is NECESSARY for - compilation (gcc) on AIX. Damn efficient linkers. */ int test1_27_globalVariable5[10] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; int test1_27_globalVariable6[10] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; float test1_27_globalVariable7[10] = {0.0, 1.0, 2.0, 3.0, 4.0, 5.0, @@ -137,8 +135,7 @@ float test1_27_globalVariable8[12]; int test1_27_mutatee() { int retval, passed; -#if !defined(rs6000_ibm_aix4_1_test) \ - && !defined(i386_unknown_linux2_0_test) \ +#if !defined(i386_unknown_linux2_0_test) \ && !defined(x86_64_unknown_linux2_4_test) /* Blind duplication - Ray */ \ && !defined(i386_unknown_nt4_0_test) \ && !defined(os_freebsd_test) diff --git a/src/dyninst/test1_29F_fortran.F b/src/dyninst/test1_29F_fortran.F index f95ed4e0..842ce7f6 100644 --- a/src/dyninst/test1_29F_fortran.F +++ b/src/dyninst/test1_29F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_29F_mutatee.c b/src/dyninst/test1_29F_mutatee.c index 7961bf0c..e1696244 100644 --- a/src/dyninst/test1_29F_mutatee.c +++ b/src/dyninst/test1_29F_mutatee.c @@ -46,11 +46,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_29_func1 test1_29_func1_ #define test1_29f_init_globals test1_29f_init_globals_ #define test1_29f_globals test1_29f_globals_ -#endif extern struct block_ test1_29f_globals; @@ -76,7 +74,7 @@ int test1_29F_mutatee() { test1_29f_init_globals(); - /* XXX Hack, AIX 4.2 xlf90/parseStab doesn't get scoping rules right for Fortran. This lets + /* XXX Hack, parseStab doesn't get scoping rules right for Fortran. This lets the C global override the local scope in this case - jkh 5/2/3 */ if (test1_29_globalVariable1) { test1_29f_globals.test1_29_globalVariable1 = test1_29_globalVariable1; diff --git a/src/dyninst/test1_2F_fortran.F b/src/dyninst/test1_2F_fortran.F index 0869cdc6..6eab0776 100644 --- a/src/dyninst/test1_2F_fortran.F +++ b/src/dyninst/test1_2F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_2F_mutatee.c b/src/dyninst/test1_2F_mutatee.c index 3e1cc0bc..0706e3e0 100644 --- a/src/dyninst/test1_2F_mutatee.c +++ b/src/dyninst/test1_2F_mutatee.c @@ -46,11 +46,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_2_func2_1 test1_2_func2_1_ #define test1_2f_init_globals test1_2f_init_globals_ #define test1_2f_globals test1_2f_globals_ -#endif extern struct block_ test1_2f_globals; diff --git a/src/dyninst/test1_30_mutatee.c b/src/dyninst/test1_30_mutatee.c index f3f4bcc1..692cf77c 100644 --- a/src/dyninst/test1_30_mutatee.c +++ b/src/dyninst/test1_30_mutatee.c @@ -81,11 +81,7 @@ int test1_30_mutatee() { func30_2(); passed = !test1_30_globalVariable3 || -#if defined(rs6000_ibm_aix4_1_test) - ((test1_30_globalVariable8 <= test1_30_globalVariable3) && -#else ((globalVariable30_2 <= test1_30_globalVariable3) && -#endif (test1_30_globalVariable3 <= test1_30_globalVariable9)); if (!passed){ @@ -94,11 +90,7 @@ int test1_30_mutatee() { } passed = !test1_30_globalVariable4 || -#if defined(rs6000_ibm_aix4_1_test) - ((test1_30_globalVariable8 <= test1_30_globalVariable4) && -#else ((globalVariable30_2 <= test1_30_globalVariable4) && -#endif (test1_30_globalVariable4 <= test1_30_globalVariable9)); if (!passed) { @@ -107,11 +99,7 @@ int test1_30_mutatee() { } passed = !test1_30_globalVariable5 || -#if defined(rs6000_ibm_aix4_1_test) - ((test1_30_globalVariable8 <= test1_30_globalVariable5) && -#else ((globalVariable30_2 <= test1_30_globalVariable5) && -#endif (test1_30_globalVariable5 <= test1_30_globalVariable9)); if (!passed) { diff --git a/src/dyninst/test1_31F_fortran.F b/src/dyninst/test1_31F_fortran.F index 7b224dde..619325a5 100644 --- a/src/dyninst/test1_31F_fortran.F +++ b/src/dyninst/test1_31F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_31F_mutatee.c b/src/dyninst/test1_31F_mutatee.c index 7b3f13af..2978ca49 100644 --- a/src/dyninst/test1_31F_mutatee.c +++ b/src/dyninst/test1_31F_mutatee.c @@ -46,11 +46,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_31_func1 test1_31_func1_ #define test1_31f_init_globals test1_31f_init_globals_ #define test1_31f_globals test1_31f_globals_ -#endif extern struct block_ test1_31f_globals; diff --git a/src/dyninst/test1_32F_fortran.F b/src/dyninst/test1_32F_fortran.F index b9c894fc..3aa13379 100644 --- a/src/dyninst/test1_32F_fortran.F +++ b/src/dyninst/test1_32F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_32F_mutatee.c b/src/dyninst/test1_32F_mutatee.c index d0ff845d..52ea850b 100644 --- a/src/dyninst/test1_32F_mutatee.c +++ b/src/dyninst/test1_32F_mutatee.c @@ -46,11 +46,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_32_func1 test1_32_func1_ #define test1_32f_init_globals test1_32f_init_globals_ #define test1_32f_globals test1_32f_globals_ -#endif extern struct block_ test1_32f_globals; diff --git a/src/dyninst/test1_33F_fortran.F b/src/dyninst/test1_33F_fortran.F index 082f7337..9b02415b 100644 --- a/src/dyninst/test1_33F_fortran.F +++ b/src/dyninst/test1_33F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_33F_mutatee.c b/src/dyninst/test1_33F_mutatee.c index fc42736c..85516ac0 100644 --- a/src/dyninst/test1_33F_mutatee.c +++ b/src/dyninst/test1_33F_mutatee.c @@ -45,10 +45,8 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_33_func1 test1_33_func1_ #define test1_33f_globals test1_33f_globals_ -#endif extern struct block_ test1_33f_globals; diff --git a/src/dyninst/test1_34F_fortran.F b/src/dyninst/test1_34F_fortran.F index bf8a1025..2b823717 100644 --- a/src/dyninst/test1_34F_fortran.F +++ b/src/dyninst/test1_34F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_34F_mutatee.c b/src/dyninst/test1_34F_mutatee.c index b382aeb1..f714be12 100644 --- a/src/dyninst/test1_34F_mutatee.c +++ b/src/dyninst/test1_34F_mutatee.c @@ -45,10 +45,8 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_34_func1 test1_34_func1_ #define test1_34f_globals test1_34f_globals_ -#endif extern struct block_ test1_34f_globals; diff --git a/src/dyninst/test1_36F_fortran.F b/src/dyninst/test1_36F_fortran.F index 27c7f686..4c6410e1 100644 --- a/src/dyninst/test1_36F_fortran.F +++ b/src/dyninst/test1_36F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand @@ -113,10 +108,6 @@ SUBROUTINE test1_36_func1 failure = 1 endif -#if defined(rs6000_ibm_aix4_1_test) && !defined(AIX5) - call xlf90_41_hack() -#endif - if (test1_36_globalVariable1 .ne. 1) then print *, ' for test 36, expecting arg1 value of 1, got ', & test1_36_globalVariable1 diff --git a/src/dyninst/test1_36F_mutatee.c b/src/dyninst/test1_36F_mutatee.c index ed6528f2..4b7c2a61 100644 --- a/src/dyninst/test1_36F_mutatee.c +++ b/src/dyninst/test1_36F_mutatee.c @@ -49,11 +49,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_36_func1 test1_36_func1_ #define test1_36f_init_globals test1_36f_init_globals_ #define test1_36f_globals test1_36f_globals_ -#endif extern struct block_ test1_36f_globals; @@ -102,18 +100,3 @@ int test1_36F_mutatee() { return -1; } } - -void xlf90_41_hack() -{ - test1_36f_globals.test1_36_globalVariable1_ = test1_36_globalVariable1; - test1_36f_globals.test1_36_globalVariable2_ = test1_36_globalVariable2; - test1_36f_globals.test1_36_globalVariable3_ = test1_36_globalVariable3; - test1_36f_globals.test1_36_globalVariable4_ = test1_36_globalVariable4; - test1_36f_globals.test1_36_globalVariable5_ = test1_36_globalVariable5; - test1_36f_globals.test1_36_globalVariable6_ = test1_36_globalVariable6; - test1_36f_globals.test1_36_globalVariable7_ = test1_36_globalVariable7; - test1_36f_globals.test1_36_globalVariable8_ = test1_36_globalVariable8; - test1_36f_globals.test1_36_globalVariable9_ = test1_36_globalVariable9; - test1_36f_globals.test1_36_globalVariable10_ = test1_36_globalVariable10; -} - diff --git a/src/dyninst/test1_39.C b/src/dyninst/test1_39.C index 28b93c10..85dd648b 100644 --- a/src/dyninst/test1_39.C +++ b/src/dyninst/test1_39.C @@ -59,8 +59,7 @@ extern "C" DLLEXPORT TestMutator *test1_39_factory() test_results_t test1_39_Mutator::executeTest() { // Note: regex search by module is covered in test 21 -#if defined(rs6000_ibm_aix4_1_test) \ - || defined(os_linux_test) /* Use OS #define instead of platform - Greg */ \ +#if defined(os_linux_test) /* Use OS #define instead of platform - Greg */ \ || defined(os_freebsd_test) // ^^^ Not Windows diff --git a/src/dyninst/test1_39_mutatee.c b/src/dyninst/test1_39_mutatee.c index 6d1df249..e1160cfc 100644 --- a/src/dyninst/test1_39_mutatee.c +++ b/src/dyninst/test1_39_mutatee.c @@ -57,8 +57,7 @@ int test1_39_passed = -1; /* Test #39 (refex function search) */ int test1_39_mutatee() { -#if defined(rs6000_ibm_aix4_1_test) \ - || defined(os_linux_test) /* Use OS #define instead of platform - Greg */ \ +#if defined(os_linux_test) /* Use OS #define instead of platform - Greg */ \ || defined(os_freebsd_test) /* The only possible failures occur in the mutator. */ diff --git a/src/dyninst/test1_3F_fortran.F b/src/dyninst/test1_3F_fortran.F index b431a0a1..6cc6552c 100644 --- a/src/dyninst/test1_3F_fortran.F +++ b/src/dyninst/test1_3F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_3F_mutatee.c b/src/dyninst/test1_3F_mutatee.c index 6053c766..326bbe8c 100644 --- a/src/dyninst/test1_3F_mutatee.c +++ b/src/dyninst/test1_3F_mutatee.c @@ -46,11 +46,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_3_func3_1 test1_3_func3_1_ #define test1_3f_init_globals test1_3f_init_globals_ #define test1_3f_globals test1_3f_globals_ -#endif extern struct block_ test1_3f_globals; diff --git a/src/dyninst/test1_4F_fortran.F b/src/dyninst/test1_4F_fortran.F index d5667617..10e90e88 100644 --- a/src/dyninst/test1_4F_fortran.F +++ b/src/dyninst/test1_4F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_4F_mutatee.c b/src/dyninst/test1_4F_mutatee.c index d6bbb034..cf49bd30 100644 --- a/src/dyninst/test1_4F_mutatee.c +++ b/src/dyninst/test1_4F_mutatee.c @@ -46,11 +46,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_4_func1 test1_4_func1_ #define test1_4f_init_globals test1_4f_init_globals_ #define test1_4f_globals test1_4f_globals_ -#endif extern struct block_ test1_4f_globals; diff --git a/src/dyninst/test1_5F_fortran.F b/src/dyninst/test1_5F_fortran.F index 6eb75cb2..a0c886c3 100644 --- a/src/dyninst/test1_5F_fortran.F +++ b/src/dyninst/test1_5F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_5F_mutatee.c b/src/dyninst/test1_5F_mutatee.c index cb03eebb..394943b4 100644 --- a/src/dyninst/test1_5F_mutatee.c +++ b/src/dyninst/test1_5F_mutatee.c @@ -46,11 +46,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_5_func1 test1_5_func1_ #define test1_5f_init_globals test1_5f_init_globals_ #define test1_5f_globals test1_5f_globals_ -#endif extern struct block_ test1_5f_globals; diff --git a/src/dyninst/test1_6F_fortran.F b/src/dyninst/test1_6F_fortran.F index bdbfd402..47d1c50c 100644 --- a/src/dyninst/test1_6F_fortran.F +++ b/src/dyninst/test1_6F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_6F_mutatee.c b/src/dyninst/test1_6F_mutatee.c index a878a987..ff73d661 100644 --- a/src/dyninst/test1_6F_mutatee.c +++ b/src/dyninst/test1_6F_mutatee.c @@ -51,11 +51,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_6_func1 test1_6_func1_ #define test1_6f_init_globals test1_6f_init_globals_ #define test1_6f_globals test1_6f_globals_ -#endif extern struct block_ test1_6f_globals; diff --git a/src/dyninst/test1_7F_fortran.F b/src/dyninst/test1_7F_fortran.F index a4145aa6..d71d6c1e 100644 --- a/src/dyninst/test1_7F_fortran.F +++ b/src/dyninst/test1_7F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_7F_mutatee.c b/src/dyninst/test1_7F_mutatee.c index d0699d4a..602ba74a 100644 --- a/src/dyninst/test1_7F_mutatee.c +++ b/src/dyninst/test1_7F_mutatee.c @@ -56,11 +56,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_7_func1 test1_7_func1_ #define test1_7f_init_globals test1_7f_init_globals_ #define test1_7f_globals test1_7f_globals_ -#endif extern struct block_ test1_7f_globals; diff --git a/src/dyninst/test1_8F_fortran.F b/src/dyninst/test1_8F_fortran.F index 1d311ad1..da2898de 100644 --- a/src/dyninst/test1_8F_fortran.F +++ b/src/dyninst/test1_8F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_8F_mutatee.c b/src/dyninst/test1_8F_mutatee.c index e48c02c3..6a229853 100644 --- a/src/dyninst/test1_8F_mutatee.c +++ b/src/dyninst/test1_8F_mutatee.c @@ -46,11 +46,9 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_8_func1 test1_8_func1_ #define test1_8f_init_globals test1_8f_init_globals_ #define test1_8f_globals test1_8f_globals_ -#endif extern struct block_ test1_8f_globals; diff --git a/src/dyninst/test1_9F_fortran.F b/src/dyninst/test1_9F_fortran.F index 156708cd..3e1ace2d 100644 --- a/src/dyninst/test1_9F_fortran.F +++ b/src/dyninst/test1_9F_fortran.F @@ -33,12 +33,7 @@ ! derived from a previous test by Jeff Hollingsworth !------------------------------------------------------------------------------ - -! AIX xlf90 does not insert underscores at end - -#if !defined(XLF) #define stop_process_ stop_process -#endif #ifdef __GNUC__ #define AND iand diff --git a/src/dyninst/test1_9F_mutatee.c b/src/dyninst/test1_9F_mutatee.c index 24d294aa..44c4abbc 100644 --- a/src/dyninst/test1_9F_mutatee.c +++ b/src/dyninst/test1_9F_mutatee.c @@ -45,10 +45,8 @@ struct block_ { int passedTest_; }; -#if !defined(XLF) #define test1_9_func1 test1_9_func1_ #define test1_9f_globals test1_9f_globals_ -#endif extern struct block_ test1_9f_globals; diff --git a/src/dyninst/test2_10.C b/src/dyninst/test2_10.C index b4e28871..5ab9e17c 100644 --- a/src/dyninst/test2_10.C +++ b/src/dyninst/test2_10.C @@ -63,8 +63,7 @@ extern "C" DLLEXPORT TestMutator *test2_10_factory() { // // static int mutatorTest(BPatch_thread *thread, BPatch_image * /*appImage */) test_results_t test2_10_Mutator::executeTest() { -#if !defined(rs6000_ibm_aix4_1_test) \ - && !defined(i386_unknown_linux2_0_test) \ +#if !defined(i386_unknown_linux2_0_test) \ && !defined(x86_64_unknown_linux2_4_test) /* Blind duplication - Ray */ \ && !defined(ppc32_linux)) // Looks like it runs on everything but Windows - Greg diff --git a/src/dyninst/test2_6.C b/src/dyninst/test2_6.C index 229cc9c1..1e7314e1 100644 --- a/src/dyninst/test2_6.C +++ b/src/dyninst/test2_6.C @@ -81,10 +81,7 @@ test_results_t test2_6_Mutator::executeTest() { char name[80]; (*m)[i]->getName(name, sizeof(name)); if (strstr(name, TEST_DYNAMIC_LIB) || -#ifdef os_aix_test - strcmp(name, TEST_DYNAMIC_LIB_NOPATH) == 0 || -#endif - strcmp(name, noext.c_str()) || + strcmp(name, noext.c_str()) || strcmp(name, match2) == 0) { found = true; break; diff --git a/src/dyninst/test2_7.C b/src/dyninst/test2_7.C index 4db0ec06..b54fbad6 100644 --- a/src/dyninst/test2_7.C +++ b/src/dyninst/test2_7.C @@ -65,7 +65,7 @@ static void lcase(char *s) { // static int mutatorTest(BPatch_thread *thread, BPatch_image *img) test_results_t test2_7_Mutator::executeTest() { #if !defined(os_linux_test) && \ - !defined(os_aix_test) && !defined(os_windows_test) && \ + !defined(os_windows_test) && \ !defined(os_freebsd_test) logerror("Skipping test #7 (load a dynamically linked library from the mutator)\n"); logerror(" feature not implemented on this platform\n"); @@ -98,9 +98,6 @@ test_results_t test2_7_Mutator::executeTest() { lcase(name); #endif if (strstr(name, TEST_DYNAMIC_LIB2) || -#ifdef os_aix_test - strcmp(name, TEST_DYNAMIC_LIB2_NOPATH) == 0 || -#endif strstr(name, noext.c_str()) || strcmp(name, match2) == 0) { found = true; diff --git a/src/dyninst/test2_7_mutatee.c b/src/dyninst/test2_7_mutatee.c index 16e55337..6046dd08 100644 --- a/src/dyninst/test2_7_mutatee.c +++ b/src/dyninst/test2_7_mutatee.c @@ -54,7 +54,7 @@ int test2_7_passed = 0; /* Function definitions follow */ int test2_7_mutatee() { -#if defined(os_linux_test) || defined(os_aix_test) || defined(os_windows_test) || defined(os_freebsd_test) +#if defined(os_linux_test) || defined(os_windows_test) || defined(os_freebsd_test) if (test2_7_passed) { test_passes("test2_7"); return 0; /* No error */ diff --git a/src/dyninst/test3_6.C b/src/dyninst/test3_6.C index 89e119fe..64e3261a 100644 --- a/src/dyninst/test3_6.C +++ b/src/dyninst/test3_6.C @@ -181,7 +181,6 @@ test_results_t test3_6_Mutator::executeTest() { logerror(" mutatee process [%d] was not terminated\n", n); continue; } -#if !defined(os_aix_test) if(appProc[n]->terminationStatus() != expectedSignal) { logerror("**Failed** test3_6 (simultaneous multiple-process management - terminate (fork))\n"); logerror(" mutatee process [%d] didn't get notice of termination\n", n); @@ -189,7 +188,6 @@ test_results_t test3_6_Mutator::executeTest() { } int signalNum = appProc[n]->getExitSignal(); dprintf("Terminated mutatee [%d] from signal 0x%x\n", n, signalNum); -#endif } for (n=0; n 0){ - dprintf("%d waiting for child\n", getpid()); - - /* On AIX the child dies when the parent exits, so wait */ - /* apparently the parent needs to wake up occasionally to keep Dyninst happy */ - dprintf("%d SLEEPING\n",getpid()); - sleep(5); - dprintf("%d SLEEP MORE\n",getpid()); - sleep(1); - dprintf("%d SLEEP MORE\n",getpid()); - sleep(5); - dprintf("%d DONE SLEEPING\n",getpid()); - } -#endif - dprintf("Mutatee %d exiting...\n", getpid()); exit(getpid()); } else if (pid < 0) { diff --git a/src/dyninst/test4_4_mutatee.c b/src/dyninst/test4_4_mutatee.c index 79f76306..5e172e53 100644 --- a/src/dyninst/test4_4_mutatee.c +++ b/src/dyninst/test4_4_mutatee.c @@ -121,18 +121,6 @@ int test4_4_mutatee() perror("execvp"); } else { test4_4_func2(); -#if defined(rs6000_ibm_aix4_1_test) - /* On AIX the child dies when the parent exits, so wait */ - /* and the parent needs to wake up occasionally to keep dyninst happy*/ - dprintf("%d SLEEPING\n",getpid()); - sleep(10); - dprintf("%d SLEEP MORE\n",getpid()); - sleep(2); - dprintf("%d SLEEP MORE\n",getpid()); - sleep(5); - dprintf("%d DONE SLEEPING\n",getpid()); - -#endif exit(getpid()); } #endif diff --git a/src/dyninst/test5_5.C b/src/dyninst/test5_5.C index 7fc55055..bcccb77f 100644 --- a/src/dyninst/test5_5.C +++ b/src/dyninst/test5_5.C @@ -88,16 +88,12 @@ test_results_t test5_5_Mutator::executeTest() { return FAILED; } - // AIX doesn't keep symbols for local variables; however, we can test the - // remainder of the functionality. -#if !defined(os_aix_test) if (!var2) { logerror("**Failed** test #5 (namespace)\n"); if (!var2) logerror(" can't find file local variable local_file_var_5_5\n"); return FAILED; } -#endif bpfv.clear(); const char *fn2 = "main"; diff --git a/src/dyninst/test6.h b/src/dyninst/test6.h index 0e0b56d6..8f905294 100644 --- a/src/dyninst/test6.h +++ b/src/dyninst/test6.h @@ -79,10 +79,6 @@ // naxses -#ifdef rs6000_ibm_aix4_1_test -const unsigned int naxses = 73; -#endif - #if defined(arch_x86_test) #if defined(os_windows_test) const unsigned int naxses = 95; diff --git a/src/dyninst/test_mem_4.C b/src/dyninst/test_mem_4.C index 4f81c2e2..cd5a421e 100644 --- a/src/dyninst/test_mem_4.C +++ b/src/dyninst/test_mem_4.C @@ -58,8 +58,7 @@ extern "C" DLLEXPORT TestMutator *test_mem_4_factory() { test_results_t test_mem_4_Mutator::executeTest() { int testnum = 4; const char* testdesc = "access instrumentation"; -#if !defined(rs6000_ibm_aix4_1_test) \ - && !defined(i386_unknown_linux2_0_test) \ +#if !defined(i386_unknown_linux2_0_test) \ && !defined(x86_64_unknown_linux2_4_test) /* Blind duplication - Ray */ \ && !defined(i386_unknown_nt4_0_test) \ && !defined(amd64_unknown_freebsd7_0_test) \ diff --git a/src/dyninst/test_mem_6.C b/src/dyninst/test_mem_6.C index 9aee3d74..fbfebeea 100644 --- a/src/dyninst/test_mem_6.C +++ b/src/dyninst/test_mem_6.C @@ -58,8 +58,7 @@ extern "C" DLLEXPORT TestMutator *test_mem_6_factory() { test_results_t test_mem_6_Mutator::executeTest() { int testnum = 6; const char* testdesc ="instrumentation w/byte count snippet"; -#if !defined(rs6000_ibm_aix4_1_test) \ - && !defined(i386_unknown_linux2_0_test) \ +#if !defined(i386_unknown_linux2_0_test) \ && !defined(x86_64_unknown_linux2_4_test) /* Blind duplication - Ray */ \ && !defined(i386_unknown_nt4_0_test) \ && !defined(amd64_unknown_freebsd7_0_test) \ diff --git a/src/dyninst/test_mem_7.C b/src/dyninst/test_mem_7.C index 73d2b610..d40b69c2 100644 --- a/src/dyninst/test_mem_7.C +++ b/src/dyninst/test_mem_7.C @@ -58,8 +58,7 @@ extern "C" DLLEXPORT TestMutator *test_mem_7_factory() { test_results_t test_mem_7_Mutator::executeTest() { int testnum = 7; const char* testdesc = "conditional instrumentation w/effective address snippet"; -#if !defined(rs6000_ibm_aix4_1_test) \ - && !defined(i386_unknown_linux2_0_test) \ +#if !defined(i386_unknown_linux2_0_test) \ && !defined(x86_64_unknown_linux2_4_test) /* Blind duplication - Ray */ \ && !defined(i386_unknown_nt4_0_test) \ && !defined(amd64_unknown_freebsd7_0_test) \ diff --git a/src/dyninst/test_mem_8.C b/src/dyninst/test_mem_8.C index 1381ea11..df115059 100644 --- a/src/dyninst/test_mem_8.C +++ b/src/dyninst/test_mem_8.C @@ -58,8 +58,7 @@ extern "C" DLLEXPORT TestMutator *test_mem_8_factory() { test_results_t test_mem_8_Mutator::executeTest() { int testnum = 8; const char* testdesc = "conditional instrumentation w/byte count snippet"; -#if !defined(rs6000_ibm_aix4_1_test) \ - && !defined(i386_unknown_linux2_0_test) \ +#if !defined(i386_unknown_linux2_0_test) \ && !defined(x86_64_unknown_linux2_4_test) /* Blind duplication - Ray */ \ && !defined(i386_unknown_nt4_0_test) \ && !defined(amd64_unknown_freebsd7_0_test) \ diff --git a/src/dyninst/test_mem_util.c b/src/dyninst/test_mem_util.c index 5c1fe6ef..d7e6bebf 100644 --- a/src/dyninst/test_mem_util.c +++ b/src/dyninst/test_mem_util.c @@ -34,27 +34,6 @@ #include "../src/dyninst/test_mem_util.h" #include "../src/mutatee_util.h" -/* Sun Forte/WorkShop cc releases older than 6.2 do not like these defines: */ -/* (macro versions of these calls are in test_mem_util.h) */ -#if defined(__SUNPRO_C) && (__SUNPRO_C < 0x530) -void passorfail(int i, int p, char* d, char* r) -{ - if(p) { - logerror("Passed test #%d (%s)\n", (i), (d)); - passedTest[(i)] = TRUE; - } else { - logerror("\n**Failed** test #%d (%s): %s\n", (i), (d), (r)); - } -} - -void skiptest(int i, char* d) -{ - logerror("Skipping test #%d (%s)\n", (i), (d)); - logerror(" not implemented on this platform\n"); - passedTest[(i)] = TRUE; -} -#endif - int result_of_loadsnstores; unsigned int loadCnt = 0; @@ -80,77 +59,6 @@ void* eaExpCC[1000]; unsigned int bcExpCC[1000]; -#ifdef rs6000_ibm_aix4_1_test -const unsigned int loadExp=41; -const unsigned int storeExp=32; -const unsigned int prefeExp=0; -const unsigned int accessExp=73; -const unsigned int accessExpCC=73; - -unsigned int bcExp[] = { 4, 1,1,1,1, 2,2,2,2, 2,2,2,2, 4,4,4,4, - 4,4,4, 8,8,8,8, 1,1,1,1, 2,2,2,2, - 4,4,4,4, 8,8,8,8, 2,4,2,4, 76,76,24,20, - 20,20, 4,4,8,8, 4, 4,4,4,4, 4, 8,8,8,8, - 4,4,4,4, 8,8,8,8, 4 }; - -int eaExpOffset[] = { 0, 17,3,1,2, 0,4,2,0, 2,2,2,2, 0,4,4,4, - 4,12,2, 0,0,0,0, 3,1,1,1, 2,6,2,2, - 0,4,4,4, 0,0,0,0, 0,0,0,0, -76,-76,-24,-24, - -20,-20, 0,0,0,0, 0, 0,4,0,4, 0, 0,8,8,8, - 4,12,0,0, 0,8,8,8, 0 }; - -/* _inline */ void init_test_data() -{ - int i; - - void *toc = gettoc(); - void *sp = getsp(1,2,3); - - dprintf("divarw = %p\n", divarw); - dprintf("dfvars = %p\n", dfvars); - dprintf("dfvard = %p\n", dfvard); - - dprintf("toc = %p\n", toc); - dprintf("sp = %p\n", sp); - - eaExp[0] = toc; /* assuming that TOC entries are not reordered */ - - for(i=1; i<44; ++i) - eaExp[i] = (void*)((unsigned long)divarw + eaExpOffset[i]); - - for(i=44; i<50; ++i) - eaExp[i] = (void*)((unsigned long)sp + eaExpOffset[i]);; /* SP */ - - for(i=50; i<54; ++i) - eaExp[i] = (void*)((unsigned long)divarw + eaExpOffset[i]); - - eaExp[54] = (void*)((unsigned long)toc + sizeof(void*)); /* TOC */ - - for(i=55; i<59; ++i) - eaExp[i] = (void*)((unsigned long)dfvars + eaExpOffset[i]); - - eaExp[59] = (void*)((unsigned long)toc + 2*sizeof(void*)); /* TOC */ - - for(i=60; i<64; ++i) - eaExp[i] = (void*)((unsigned long)dfvard + eaExpOffset[i]); - - for(i=64; i<68; ++i) - eaExp[i] = (void*)((unsigned long)dfvars + eaExpOffset[i]); - - for(i=68; i<72; ++i) - eaExp[i] = (void*)((unsigned long)dfvard + eaExpOffset[i]); - - eaExp[72] = (void*)((unsigned long)dfvars + eaExpOffset[i]); - - - /* Duplicate the stream for cc */ - for(i=0; i= 0x530) #define passorfail(i,p,d,r) if((p)) { \ logerror("Passed test #%d (%s)\n", (i), (d)); \ passedTest[(i)] = TRUE; \ @@ -46,10 +44,7 @@ extern "C" { #define skiptest(i,d) { logerror("Skipping test #%d (%s)\n", (i), (d)); \ logerror(" not implemented on this platform\n"); \ passedTest[(i)] = TRUE; } -#else -void passorfail(int i, int p, char* d, char* r); -void skiptest(int i, char* d); -#endif + extern long loadsnstores(long, long, long); /* ILP32 & LP64 */ @@ -77,39 +72,6 @@ extern unsigned int bcListCC[1000]; extern void* eaExpCC[1000]; extern unsigned int bcExpCC[1000]; - -#ifdef rs6000_ibm_aix4_1_test -extern const unsigned int loadExp; -extern const unsigned int storeExp; -extern const unsigned int prefeExp; -extern const unsigned int accessExp; -extern const unsigned int accessExpCC; - -extern unsigned int bcExp[]; - -extern int eaExpOffset[]; - -extern void* eaExp[]; /* forward */ -/* Make sure this is 4 words long... */ -extern int divarw[4]; -extern float dfvars[4]; -extern double dfvard[4]; - -extern void* gettoc(); -#ifdef rs6000_ibm_aix4_1_test -/* Had trouble with this one */ -extern void *getsp(int, int, int); -#else -extern void* getsp(); -#endif - -#ifdef __GNUC__ -#define _inline inline -#endif - -extern /* _inline */ void init_test_data(); -#endif /* defined(rs6000_ibm_aix4_1_test) */ - #if defined(i386_unknown_linux2_0_test) \ || defined(i386_unknown_nt4_0_test) \ || (defined(os_freebsd_test) && defined(arch_x86_test)) diff --git a/src/dyninst/test_stack_1.C b/src/dyninst/test_stack_1.C index 8980b44b..89cbe80a 100644 --- a/src/dyninst/test_stack_1.C +++ b/src/dyninst/test_stack_1.C @@ -64,9 +64,7 @@ test_results_t test_stack_1_Mutator::executeTest() { #if defined( os_linux_test ) && (defined( arch_x86_test ) || defined( arch_x86_64_test )) { true, true, BPatch_frameNormal, "_dl_sysinfo_int80" }, #endif -#if !defined(rs6000_ibm_aix4_1_test) { false, false, BPatch_frameNormal, NULL }, -#endif #if !defined(i386_unknown_nt4_0_test) { true, false, BPatch_frameNormal, "stop_process_" }, #endif diff --git a/src/dyninst/test_stack_2.C b/src/dyninst/test_stack_2.C index 00c31382..6efc63e3 100644 --- a/src/dyninst/test_stack_2.C +++ b/src/dyninst/test_stack_2.C @@ -66,9 +66,7 @@ test_results_t test_stack_2_Mutator::executeTest() { #if defined( os_linux_test ) && (defined( arch_x86_test ) || defined( arch_x86_64_test )) { true, true, BPatch_frameNormal, "_dl_sysinfo_int80" }, #endif -#if !defined(rs6000_ibm_aix4_1_test) { false, false, BPatch_frameNormal, NULL }, -#endif { true, false, BPatch_frameNormal, "stop_process_" }, { true, false, BPatch_frameNormal, "test_stack_2_func4" }, { true, false, BPatch_frameNormal, "sigalrm_handler" }, diff --git a/src/dyninst/test_stack_3.C b/src/dyninst/test_stack_3.C index 2615fa0e..16d4b19a 100644 --- a/src/dyninst/test_stack_3.C +++ b/src/dyninst/test_stack_3.C @@ -72,11 +72,7 @@ test_results_t test_stack_3_Mutator::executeTest() { #if defined( os_linux_test ) && (defined( arch_x86_test ) || defined( arch_x86_64_test )) { true, true, BPatch_frameNormal, "_dl_sysinfo_int80" }, #endif -#if defined( os_aix_test ) && defined( arch_power_test ) - /* AIX uses kill(), but the PC of a process in a syscall can - not be correctly determined, and appears to be the address - to which the syscall function will return. */ -#elif defined( os_windows_test ) && (defined( arch_x86 ) || defined( arch_x86_64_test )) +#if defined( os_windows_test ) && (defined( arch_x86 ) || defined( arch_x86_64_test )) /* Windows/x86 does not use kill(), so its lowermost frame will be something unidentifiable in a system DLL. */ { false, false, BPatch_frameNormal, NULL }, @@ -90,7 +86,7 @@ test_results_t test_stack_3_Mutator::executeTest() { #endif { true, false, BPatch_frameNormal, "test_stack_3_func3" }, { true, false, BPatch_frameTrampoline, NULL }, - /* On AIX and x86 (and others), if our instrumentation fires + /* On x86 (and others), if our instrumentation fires before frame construction or after frame destruction, it's acceptable to not report the function (since, after all, it doesn't have a frame on the stack. */ diff --git a/src/dyninst/test_thread_1_mutatee.c b/src/dyninst/test_thread_1_mutatee.c index 46b11ea1..4de3905d 100644 --- a/src/dyninst/test_thread_1_mutatee.c +++ b/src/dyninst/test_thread_1_mutatee.c @@ -164,7 +164,7 @@ int func1_1() current_locks[i] = 0; } -#if !defined (os_windows_test) && !defined(os_irix) +#if !defined (os_windows_test) #if defined(m32_test) libname = "libdyninstAPI_RT_m32.so"; @@ -205,23 +205,12 @@ int func1_1() pthread_mutex_init(&real_lock, NULL); (*DYNINSTunlock_thelock)(&test1lock); - /* XXX this is nasty */ /* The way this is supposed to work is that we get a lock, then start a bunch of threads, which all try to get the same lock, pretty much as soon as they start. Then, after starting all the threads, we release the lock and let the threads compete for it, checking to make sure that all threads get the lock at some point and that no two threads have it at the same time. - The problem is that solaris is having problems with this system when the lock is - obtained before the threads are spawned (pthread_create hangs) -- it is still ok - to just start all the threads and have the system run, its just not quite as clean. - This might be bad asm programming on my behalf, or it might be some idiosyncracy - with solaris libpthreads. This worked, incidentally, when this stuff was all in - the mutator, but that might've been because the asm that was imported to implement - the locks was the gnu asm, not the solaris-cc asm, which is the stuff that gets - compiled, by default into the runtime lib*/ -/* - int lockres = (*DYNINSTlock_thelock)(&test1lock); -*/ + */ lockres = (*DYNINSTlock_thelock)(&test1lock); createThreads(TEST1_THREADS, thread_main1, test1threads); diff --git a/src/mutatee_util.h b/src/mutatee_util.h index bcfba127..2364cc4c 100644 --- a/src/mutatee_util.h +++ b/src/mutatee_util.h @@ -70,11 +70,7 @@ typedef int testbarrier_t; typedef pthread_mutex_t testlock_t; typedef pthread_t thread_t; -#if defined(os_aix_test) -typedef int testbarrier_t; // Older versions of AIX don't define pthread_barrier_t -#else typedef pthread_barrier_t testbarrier_t; -#endif #endif diff --git a/src/mutatee_util_mt.c b/src/mutatee_util_mt.c index 75551711..72abe735 100644 --- a/src/mutatee_util_mt.c +++ b/src/mutatee_util_mt.c @@ -157,15 +157,6 @@ void testUnlock(testlock_t *lck) { pthread_mutex_unlock((pthread_mutex_t *) lck); } -#if defined(os_aix_test) -void initBarrier(testbarrier_t *barrier, unsigned int count) { - assert(0); // XXX What to do if missing pthread_barrier_t? -} - -void waitTestBarrier(testbarrier_t *barrier) { - assert(0); // XXX What to do if missing pthread_barrier_t? -} -#else void initBarrier(testbarrier_t *barrier, unsigned int count) { pthread_barrier_init((pthread_barrier_t *)barrier, NULL, count); } @@ -177,7 +168,6 @@ void testBarrierDestroy(testbarrier_t *b) { void waitTestBarrier(testbarrier_t *barrier) { pthread_barrier_wait((pthread_barrier_t *)barrier); } -#endif thread_t threadSelf() { return (thread_t) pthread_self(); diff --git a/src/runTests-utils.C b/src/runTests-utils.C index e70dfff7..02007c4a 100644 --- a/src/runTests-utils.C +++ b/src/runTests-utils.C @@ -356,15 +356,6 @@ char *setLibPath() char *l_tmp = strdup(tmp.str().c_str()); putenv(l_tmp); - // And add LIBPATH for AIX if necessary - stringstream AIXtmp; - AIXtmp << "LIBPATH=.:"; - if ( getenv("LIBPATH") ) { - AIXtmp << getenv("LIBPATH"); - } - char *a_tmp = strdup(AIXtmp.str().c_str()); - putenv(a_tmp); - return l_tmp; } diff --git a/src/runTests-utils.h b/src/runTests-utils.h index 553d0da4..e672a06d 100644 --- a/src/runTests-utils.h +++ b/src/runTests-utils.h @@ -45,7 +45,7 @@ #endif -#if !defined(os_aix_test) && !defined(os_windows_test) && !defined(os_freebsd_test) +#if !defined(os_windows_test) && !defined(os_freebsd_test) #include #elif defined(os_freebsd_test) #include diff --git a/src/symtab/test_exception.C b/src/symtab/test_exception.C index 7137637f..db61b4be 100644 --- a/src/symtab/test_exception.C +++ b/src/symtab/test_exception.C @@ -60,10 +60,6 @@ test_results_t test_exception_Mutator::executeTest() return SKIPPED; #endif -#if defined (os_aix_test) - return SKIPPED; -#endif - bool result = symtab->getAllExceptions(excps); if (!result || !excps.size() ) diff --git a/src/symtab/test_line_info.C b/src/symtab/test_line_info.C index 85d5d49a..acc2ad0f 100644 --- a/src/symtab/test_line_info.C +++ b/src/symtab/test_line_info.C @@ -164,10 +164,6 @@ test_results_t test_line_info_Mutator::executeTest() if (createmode == DESERIALIZE) return SKIPPED; -#if defined (os_aix_test) - //if (useAttach == DESERIALIZE) - return SKIPPED; -#endif if (FAILED == basic_verification()) { logerror( "%s[%d]: failed basic verifications, skipping rest...\n", diff --git a/src/symtab/test_relocations.C b/src/symtab/test_relocations.C index c924c1f4..cf766229 100644 --- a/src/symtab/test_relocations.C +++ b/src/symtab/test_relocations.C @@ -142,10 +142,6 @@ test_results_t test_relocations_Mutator::executeTest() return SKIPPED; #endif -#if defined (os_aix_test) - return SKIPPED; -#endif - bool result = symtab->getFuncBindingTable(relocs); if (!result || !relocs.size() ) diff --git a/src/symtab/test_type_info.C b/src/symtab/test_type_info.C index 5c2df6cf..e4eec3b1 100644 --- a/src/symtab/test_type_info.C +++ b/src/symtab/test_type_info.C @@ -43,76 +43,88 @@ using namespace Dyninst; using namespace SymtabAPI; class test_type_info_Mutator : public SymtabMutator { - std::vector *std_types; - std::vector *builtin_types; - test_results_t verify_basic_type_lists(); - std::string execname; - bool verify_type(Type *t); - bool verify_type_enum(typeEnum *t, - std::vector> * = NULL); - bool verify_type_pointer(typePointer *t, std::string * = NULL); - bool verify_type_function(typeFunction *t); - bool verify_type_subrange(typeSubrange *t); - bool verify_type_array(typeArray *t, int * = NULL, int * = NULL, - std::string * = NULL); - bool - verify_type_struct(typeStruct *t, - std::vector> * = NULL, - std::vector> * = NULL, - std::vector> * = NULL); - bool - verify_type_union(typeUnion *t, - std::vector> * = NULL, - std::vector> * = NULL); - bool verify_type_scalar(typeScalar *t); - bool verify_type_typedef(typeTypedef *t, std::string * = NULL); - bool verify_field(Field *f); - bool - verify_field_list(fieldListType *t, - std::vector> * = NULL, - std::vector> * = NULL, - std::vector> * = NULL); - - bool got_type_enum; - bool got_type_pointer; - bool got_type_function; - bool got_type_subrange; - bool got_type_array; - bool got_type_struct; - bool got_type_union; - bool got_type_scalar; - bool got_type_typedef; - - supportedLanguages lang; - -public: - test_type_info_Mutator() - : std_types(NULL), builtin_types(NULL), got_type_enum(false), - got_type_pointer(false), got_type_function(false), - got_type_subrange(false), got_type_array(false), got_type_struct(false), - got_type_union(false), got_type_scalar(false), got_type_typedef(false), - lang(lang_Unknown) {} - - bool specific_type_tests(); - - bool got_all_types() { - if (!got_type_enum) { - logerror("%s[%d]: enum was missed\n", FILE__, __LINE__); - return false; - } - - if (!got_type_pointer) { - logerror("%s[%d]: pointer was missed\n", FILE__, __LINE__); - return false; - } + std::vector *std_types; + std::vector *builtin_types; + test_results_t verify_basic_type_lists(); + std::string execname; + bool verify_type(Type *t); + bool verify_type_enum(typeEnum *t, std::vector > * = NULL); + bool verify_type_pointer(typePointer *t, std::string * = NULL); + bool verify_type_function(typeFunction *t); + bool verify_type_subrange(typeSubrange *t); + bool verify_type_array(typeArray *t, int * = NULL, int * = NULL, std::string * = NULL); + bool verify_type_struct(typeStruct *t, + std::vector > * = NULL, + std::vector > * = NULL, + std::vector > * = NULL); + bool verify_type_union(typeUnion *t, + std::vector > * = NULL, + std::vector > * = NULL); + bool verify_type_scalar(typeScalar *t); + bool verify_type_typedef(typeTypedef *t, std::string * = NULL); + bool verify_field(Field *f); + bool verify_field_list(fieldListType *t, + std::vector > * = NULL, + std::vector > * = NULL, + std::vector > * = NULL); + + bool got_type_enum; + bool got_type_pointer; + bool got_type_function; + bool got_type_subrange; + bool got_type_array; + bool got_type_struct; + bool got_type_union; + bool got_type_scalar; + bool got_type_typedef; + + supportedLanguages lang; + public: + test_type_info_Mutator() : + std_types(NULL), + builtin_types(NULL), + got_type_enum(false), + got_type_pointer(false), + got_type_function(false), + got_type_subrange(false), + got_type_array(false), + got_type_struct(false), + got_type_union(false), + got_type_scalar(false), + got_type_typedef(false), + lang(lang_Unknown) + { } + + bool specific_type_tests(); + + bool got_all_types() + { + if (!got_type_enum) + { + logerror( "%s[%d]: enum was missed\n", FILE__, __LINE__); + return false; + } + + if (!got_type_pointer) + { + logerror( "%s[%d]: pointer was missed\n", FILE__, __LINE__); + return false; + } + +#if 0 + // I think typeFunction is c++ only + if (!got_type_function) + { + logerror( "%s[%d]: function was missed\n", FILE__, __LINE__); + return false; + } +#endif - // typeFunction appears to be C++ only, so we don't check it (the mutatee is - // C). - if (!got_type_subrange) { - // solaris CC does not appear to produce these -#if !defined(os_aix_test) && !defined(os_windows_test) - logerror("%s[%d]: subrange was missed\n", FILE__, __LINE__); - return false; + if (!got_type_subrange) + { +#if !defined(os_windows_test) + logerror( "%s[%d]: subrange was missed\n", FILE__, __LINE__); + return false; #endif } @@ -263,56 +275,66 @@ bool test_type_info_Mutator::verify_type_subrange(typeSubrange *t) { return true; } -bool test_type_info_Mutator::verify_type_array(typeArray *t, int *exp_low, - int *exp_hi, - std::string *base_type_name) { - got_type_array = true; - std::string &tn = t->getName(); - - if (t->getLow() > t->getHigh()) { - // special case (encountered w/ sun compilers -- if low bound is zero and - // highbound is -1, the array is not specified with a proper range, so - // ignore - if (!(t->getLow() == 0L && t->getHigh() == -1L)) { - logerror("%s[%d]: bad ranges [%lu--%lu] for type %s!\n", FILE__, - __LINE__, t->getLow(), t->getHigh(), tn.c_str()); - return false; - } - } - - Type *b = t->getBaseType(); - if (!b) { - logerror("%s[%d]: NULL base type for type %s!\n", FILE__, __LINE__, - tn.c_str()); - return false; - } - - if (exp_low) { - if (*exp_low != t->getLow()) { - logerror("%s[%d]: unexpected lowbound %d (not %d) for type %s!\n", - FILE__, __LINE__, t->getLow(), *exp_low, tn.c_str()); - return false; - } - } - - if (exp_hi) { - if (*exp_hi != t->getHigh()) { - logerror("%s[%d]: unexpected hibound %d (not %d) for type %s!\n", FILE__, - __LINE__, t->getHigh(), *exp_hi, tn.c_str()); - return false; - } - } - - if (base_type_name) { - if (*base_type_name != b->getName()) { - logerror("%s[%d]: unexpected basetype %s (not %s) for type %s!\n", - FILE__, __LINE__, b->getName().c_str(), base_type_name->c_str(), - tn.c_str()); - return false; - } - } - - return true; +bool test_type_info_Mutator::verify_type_array(typeArray *t, int *exp_low, int *exp_hi, + std::string *base_type_name) +{ + got_type_array = true; + std::string &tn = t->getName(); + + //std::cerr << "verify_type_array for " << tn << std::endl; + + if (t->getLow() > t->getHigh()) + { + // special case -- if low bound is zero and + // highbound is -1, the array is not specified with a proper range, so + // ignore + if (! (t->getLow() == 0L && t->getHigh() == -1L)) + { + logerror( "%s[%d]: bad ranges [%lu--%lu] for type %s!\n", + FILE__, __LINE__, t->getLow(), t->getHigh(), tn.c_str()); + return false; + } + } + + Type *b = t->getBaseType(); + if (!b) + { + logerror( "%s[%d]: NULL base type for type %s!\n", + FILE__, __LINE__, tn.c_str()); + return false; + } + + if (exp_low) + { + if (*exp_low != t->getLow()) + { + logerror( "%s[%d]: unexpected lowbound %d (not %d) for type %s!\n", + FILE__, __LINE__, t->getLow(), *exp_low, tn.c_str()); + return false; + } + } + + if (exp_hi) + { + if (*exp_hi != t->getHigh()) + { + logerror( "%s[%d]: unexpected hibound %d (not %d) for type %s!\n", + FILE__, __LINE__, t->getHigh(), *exp_hi, tn.c_str()); + return false; + } + } + + if (base_type_name) + { + if (*base_type_name != b->getName()) + { + logerror( "%s[%d]: unexpected basetype %s (not %s) for type %s!\n", + FILE__, __LINE__, b->getName().c_str(), base_type_name->c_str(), tn.c_str()); + return false; + } + } + + return true; } bool test_type_info_Mutator::verify_field(Field *f) { @@ -663,128 +685,121 @@ bool test_type_info_Mutator::specific_type_tests() { return false; } #if !defined(os_windows_test) - tname = "int_alias_t"; - if (!symtab->findType(t, tname) || (NULL == t)) { - logerror("%s[%d]: could not find type %s\n", FILE__, __LINE__, - tname.c_str()); - return false; - } - - typeTypedef *ttd = t->getTypedefType(); - if (!ttd) { - logerror("%s[%d]: %s: unexpected variety\n", FILE__, __LINE__, - tname.c_str()); - return false; - } - - std::string expected_constituent_typename("int"); - if (!verify_type_typedef(ttd, &expected_constituent_typename)) - return false; - - tname = "int_array_t"; - if (!symtab->findType(t, tname) || (NULL == t)) { - logerror("%s[%d]: could not find type %s\n", FILE__, __LINE__, - tname.c_str()); - return false; - } - - Type *tc = NULL; - typeTypedef *tt = t->getTypedefType(); - if (!tt) { - // Caveat: Solaris and gnu compilers differ here in how they emit the stab - // for the typedef array... while it would be nice to have a consistent - // representation but it would involve creating "fake" placeholder - // typedefs... or just modifying the test to be OK with either - // scenario.... - tc = t->getArrayType(); - if (NULL == tc) { - logerror("%s[%d]: %s: unexpected variety %s\n", FILE__, __LINE__, - tname.c_str(), t->specificType().c_str()); - return false; - } - } else { - if (!verify_type_typedef(tt, NULL)) { - logerror("%s[%d]: could not verify typedef %s\n", FILE__, __LINE__, - tname.c_str()); - return false; - } - - tc = tt->getConstituentType(); - } - if (!tc) { - logerror("%s[%d]: %s: no constituent type\n", FILE__, __LINE__, - tname.c_str()); - return false; - } - - typeArray *ta = tc->getArrayType(); - if (!ta) { - logerror("%s[%d]: %s: unexpected variety: %s--%s\n", FILE__, __LINE__, - tname.c_str(), tc->specificType().c_str(), tc->getName().c_str()); - typeTypedef *ttd = tc->getTypedefType(); - if (ttd) { - Type *ttd_c = ttd->getConstituentType(); - logerror("%s[%d]: typedef constituent %s--%s\n", FILE__, __LINE__, - ttd_c->getName().c_str(), ttd_c->specificType().c_str()); - } - return false; - } - - std::string expected_array_base = "int"; - int expected_low = 0; - int expected_hi = 255; - if (!verify_type_array(ta, &expected_low, &expected_hi, - &expected_array_base)) { - logerror("%s[%d]: failed to verify typeArray\n", FILE__, __LINE__); - return false; - } - - if (std::string::npos == execname.find("CC")) { - tname = "my_intptr_t"; - if (!symtab->findType(t, tname) || (NULL == t)) { - logerror("%s[%d]: could not find type %s\n", FILE__, __LINE__, - tname.c_str()); - return false; - } - - tt = t->getTypedefType(); - if (!tt) { - logerror("%s[%d]: %s: unexpected variety\n", FILE__, __LINE__, - tname.c_str()); - return false; - } - - if (!verify_type_typedef(tt, NULL)) { - logerror("%s[%d]: could not verify typedef %s\n", FILE__, __LINE__, - tname.c_str()); - return false; - } - - tc = tt->getConstituentType(); - if (!tc) { - logerror("%s[%d]: %s: no constituent type\n", FILE__, __LINE__, - tname.c_str()); - return false; - } - - typePointer *tp = tc->getPointerType(); - if (!tp) { - logerror("%s[%d]: %s: unexpected variety: %s\n", FILE__, __LINE__, - tname.c_str(), dataClass2Str(tc->getDataClass())); - return false; - } - - std::string expected_pointer_base = "int"; - if (!verify_type_pointer(tp, &expected_pointer_base)) { - logerror("%s[%d]: could not find pointer type %s\n", FILE__, __LINE__, - tname.c_str()); - return false; - } - } else { - logerror("%s[%d]: skipped function pointer type verifiction for sun CC " - "compiler\n", - FILE__, __LINE__); - } + tname = "int_alias_t"; + if (!symtab->findType(t, tname) || (NULL == t)) + { + logerror( "%s[%d]: could not find type %s\n", FILE__, __LINE__, tname.c_str()); + return false; + } + + typeTypedef *ttd = t->getTypedefType(); + if (!ttd) + { + logerror( "%s[%d]: %s: unexpected variety\n", FILE__, __LINE__, tname.c_str()); + return false; + } + + std::string expected_constituent_typename("int"); + if (!verify_type_typedef(ttd, &expected_constituent_typename)) + return false; + + tname = "int_array_t"; + if (!symtab->findType(t, tname) || (NULL == t)) + { + logerror( "%s[%d]: could not find type %s\n", FILE__, __LINE__, tname.c_str()); + return false; + } + + Type *tc = NULL; + typeTypedef *tt = t->getTypedefType(); + if (!tt) + { + // Caveat: Some compilers differ here in how they emit the stab + // for the typedef array... while it would be nice to have a consistent representation + // but it would involve creating "fake" placeholder typedefs... or just + // modifying the test to be OK with either scenario.... + tc = t->getArrayType(); + if (NULL == tc) + { + logerror( "%s[%d]: %s: unexpected variety %s\n", + FILE__, __LINE__, tname.c_str(), t->specificType().c_str()); + return false; + } + } + else + { + if (!verify_type_typedef(tt, NULL)) + return false; + + tc = tt->getConstituentType(); + } + if (!tc) + { + logerror( "%s[%d]: %s: no constituent type\n", FILE__, __LINE__, tname.c_str()); + return false; + } + //logerror( "%s[%d]: typedef %s constituent typename: %s:%s/id %d, typedef id = %d\n", FILE__, __LINE__, tt->getName().c_str(), tc->specificType().c_str(), tc->getName().c_str(), tc->getID(), tt->getID()); + + typeArray *ta = tc->getArrayType(); + if (!ta) + { + logerror( "%s[%d]: %s: unexpected variety: %s--%s\n", FILE__, __LINE__, tname.c_str(), tc->specificType().c_str(), tc->getName().c_str()); + typeTypedef *ttd = tc->getTypedefType(); + if (ttd) + { + Type *ttd_c = ttd->getConstituentType(); + logerror( "%s[%d]: typedef constituent %s--%s\n", FILE__, __LINE__, ttd_c->getName().c_str(), ttd_c->specificType().c_str()); + } + return false; + } + + std::string expected_array_base = "int"; + int expected_low = 0; + int expected_hi = 255; + if (!verify_type_array(ta, &expected_low, &expected_hi, &expected_array_base)) + { + logerror( "%s[%d]: failed to verify typeArray\n", FILE__, __LINE__); + return false; + } + + tname = "my_intptr_t"; + if (!symtab->findType(t, tname) || (NULL == t)) + { + logerror( "%s[%d]: could not find type %s\n", + FILE__, __LINE__, tname.c_str()); + return false; + } + + tt = t->getTypedefType(); + if (!tt) + { + logerror( "%s[%d]: %s: unexpected variety\n", + FILE__, __LINE__, tname.c_str()); + return false; + } + + if (!verify_type_typedef(tt, NULL)) + return false; + + tc = tt->getConstituentType(); + if (!tc) + { + logerror( "%s[%d]: %s: no constituent type\n", + FILE__, __LINE__, tname.c_str()); + return false; + } + + typePointer *tp = tc->getPointerType(); + if (!tp) + { + logerror( "%s[%d]: %s: unexpected variety: %s\n", + FILE__, __LINE__, tname.c_str(), dataClass2Str(tc->getDataClass())); + return false; + } + + std::string expected_pointer_base = "int"; + if (!verify_type_pointer(tp, &expected_pointer_base)) + return false; #endif /* ---- Check DWARF encodings for base types ---- */ @@ -1081,10 +1096,6 @@ test_results_t test_type_info_Mutator::executeTest() { if ((createmode == DESERIALIZE) && (compiler == std::string("g++"))) return SKIPPED; #endif -#if defined(os_aix_test) - if (createmode == DESERIALIZE) - return SKIPPED; -#endif SymtabAPI::Module *mod = NULL; std::vector mods; diff --git a/src/test_driver.C b/src/test_driver.C index 42c5edea..37ea1de4 100644 --- a/src/test_driver.C +++ b/src/test_driver.C @@ -749,12 +749,6 @@ void updateSearchPaths(const char *filename) { // First, find the directory we reside in bool include_cwd_always = false; -#if defined(os_aix_test) - // AIX strips a ./ from the start of argv[0], so - // we will execute ./test_driver and see test_driver - - include_cwd_always = true; -#endif char *execpath; char pathname[PATH_MAX]; @@ -802,18 +796,11 @@ void updateSearchPaths(const char *filename) { assert(!putenv(envCopy)); char *envLibPath; -#if defined(os_aix_test) - envLibPath = getenv("LIBPATH"); -#else envLibPath = getenv("LD_LIBRARY_PATH"); -#endif envCopy = (char *) ::malloc(((envLibPath && strlen(envLibPath)) ? strlen(envLibPath) + 1 : 0) + strlen(execpath) + 17); -#if defined(os_aix_test) - strcpy(envCopy, "LIBPATH="); -#else strcpy(envCopy, "LD_LIBRARY_PATH="); -#endif + if (envLibPath && strlen(envLibPath)) { strcat(envCopy, envLibPath); strcat(envCopy, ":"); diff --git a/src/test_lib.C b/src/test_lib.C index 2ba0ef86..8dbd433a 100644 --- a/src/test_lib.C +++ b/src/test_lib.C @@ -51,10 +51,8 @@ using namespace std; #include #endif -#if defined(i386_unknown_nt4_0_test) || defined(mips_unknown_ce2_11_test) //ccw 10 apr 2001 -#ifndef mips_unknown_ce2_11_test //ccw 10 apr 2001 +#if defined(i386_unknown_nt4_0_test) //ccw 10 apr 2001 #define WIN32_LEAN_AND_MEAN -#endif #include #else #include @@ -387,13 +385,6 @@ void addLibArchExt(char *dest, unsigned int dest_max_len, int psize, bool isStat dest_len = strlen(dest); // Patch up alternate ABI filenames -#if defined(rs6000_ibm_aix64_test) - if(psize == 4) { - strncat(dest, "_32", dest_max_len - dest_len); - dest_len += 3; - } -#endif - #if defined(arch_x86_64_test) if (psize == 4) { strncat(dest,"_m32", dest_max_len - dest_len); @@ -401,11 +392,6 @@ void addLibArchExt(char *dest, unsigned int dest_max_len, int psize, bool isStat } #endif -#if defined(mips_sgi_irix6_4_test) - strncat(dest,"_n32", dest_max_len - dest_len); - dest_len += 4; -#endif - #if defined(os_windows_test) strncat(dest, ".dll", dest_max_len - dest_len); dest_len += 4; @@ -573,7 +559,6 @@ void use_liberty() #endif #if defined (os_windows_test) -// solaris does not provide setenv, so we provide an ersatz replacement. // yes it's leaky, but we don't plan on using it too much, so who cares? int setenv(const char *envname, const char *envval, int) { diff --git a/src/test_lib_soExecution.C b/src/test_lib_soExecution.C index ba95ce95..9534bf67 100644 --- a/src/test_lib_soExecution.C +++ b/src/test_lib_soExecution.C @@ -78,11 +78,7 @@ TESTLIB_DLL_EXPORT TestOutputDriver *loadOutputDriver(char *odname, void * data) static void* openSO(const char *soname, bool local) { char *fullSoPath = NULL; -#if defined(os_aix_test) - fullSoPath = searchPath(getenv("LIBPATH"), soname); -#else fullSoPath = searchPath(getenv("LD_LIBRARY_PATH"), soname); -#endif if (getDebugLog()) { fprintf(getDebugLog(), "openSO: search path is %s\n", fullSoPath ? fullSoPath : "NULL"); } @@ -161,11 +157,7 @@ ComponentTester *Module::loadModuleLibrary() { libhandle = NULL; char libname[256]; -#if defined(os_aix_test) - snprintf(libname, 256, "libtest%s.a", name.c_str()); -#else snprintf(libname, 256, "libtest%s.so", name.c_str()); -#endif libhandle = openSO(libname, false); if (!libhandle) { fprintf(stderr, "Error loading library: %s\n", dlerror());