xnu-1699.32.7.tar.gz

[apple/xnu.git] / tools / tests / xnu_quick_test / helpers / data_exec.c

diff --git a/tools/tests/xnu_quick_test/helpers/data_exec.c b/tools/tests/xnu_quick_test/helpers/data_exec.c
index f8b353c5e6a4d739f6d5a19be6da350796416ab6..8cd7c03168e5a2ad44b4fc0a4c9e8237c0d8c93b 100644 (file)
--- a/tools/tests/xnu_quick_test/helpers/data_exec.c
+++ b/tools/tests/xnu_quick_test/helpers/data_exec.c
@@ -14,10 +14,10 @@ jmp_buf resume;
 
 #define ALT_STK_SIZE   (MINSIGSTKSZ + pagesize)
 
-#if __i386__ || __ppc__
+#if __i386__
 typedef        unsigned int            psint_t;
 #endif
-#if __x86_64__ || __ppc64__
+#if __x86_64__
 typedef unsigned long long     psint_t;
 #endif
 
@@ -43,25 +43,18 @@ int verbose = 0;
 #define FAIL   -1      /* can't use 0 since setjmp uses that */
 
 int expected[4] = {
-#if __i386__
+#if NXDATA32TESTNONX
        SUCCEED,                /* execute from heap */
        SUCCEED,                /* exeucte from heap with PROT_EXEC */
        FAIL,                   /* execute from stack */
        SUCCEED,                /* exeucte from stack with PROT_EXEC */
-#endif
-#if __x86_64__
-       FAIL,                   /* execute from heap */
+#elif __i386__
+       FAIL,           /* execute from heap */
        SUCCEED,                /* exeucte from heap with PROT_EXEC */
        FAIL,                   /* execute from stack */
        SUCCEED,                /* exeucte from stack with PROT_EXEC */
 #endif
-#if __ppc__
-       SUCCEED,                /* execute from heap */
-       SUCCEED,                /* exeucte from heap with PROT_EXEC */
-       SUCCEED,                /* execute from stack */
-       SUCCEED,                /* exeucte from stack with PROT_EXEC */
-#endif
-#if __ppc64__
+#if __x86_64__
        FAIL,                   /* execute from heap */
        SUCCEED,                /* exeucte from heap with PROT_EXEC */
        FAIL,                   /* execute from stack */