dyninst · hainest · Jun 28, 2021 · Jun 15, 2021 · Jun 15, 2021 · Jun 15, 2021
diff --git 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
@@ -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<BPatch_snippet*> 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<BPatch_snippet*> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <dlfcn.h> /* For replaceFunction test */

diff --git 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:
  */