X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/b0d623f7f2ae71ed96e60569f61f9a9a27016e80..13f56ec4e58bf8687e2a68032c093c0213dd519b:/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 f8b353c5e..8cd7c0316 100644 --- 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 */