Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Unique label sysgo_incl; fix #define that might capture trailing '//'

Browse Source 
modified:   stub/src/include/linux.h
This commit is contained in:
John Reiser
2024-12-03 10:21:07 -08:00
parent 6ebdf92d40
commit d14901548a
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stub/src/include/linux.h
+23 -21
View File
@@ -96,13 +96,13 @@ struct timespec {
// So PAGE_SIZE is not constant in 64-bit mode of __powerpc64__. // So PAGE_SIZE is not constant in 64-bit mode of __powerpc64__.
// empty: not constant, must use run-time value from AT_PAGESZ // empty: not constant, must use run-time value from AT_PAGESZ
#elif defined(__mips__) //}{ #elif defined(__mips__) //}{
#define PAGE_MASK (~0ul<<16) // discards the offset, keeps the page #define PAGE_MASK (~0ul<<16) /* discards the offset, keeps the page */
#define PAGE_SIZE ( 1ul<<16) #define PAGE_SIZE ( 1ul<<16)
#elif defined(__amd64__) //}{ #elif defined(__amd64__) //}{
#define PAGE_MASK (~0ul<<12) // discards the offset, keeps the page #define PAGE_MASK (~0ul<<12) /* discards the offset, keeps the page */
#define PAGE_SIZE ( 1ul<<12) #define PAGE_SIZE ( 1ul<<12)
#elif defined(__i386__) || defined(__powerpc__) || defined(__arm__) //}{ #elif defined(__i386__) || defined(__powerpc__) || defined(__arm__) //}{
#define PAGE_MASK (~0ul<<12) // discards the offset, keeps the page #define PAGE_MASK (~0ul<<12) /* discards the offset, keeps the page */
#define PAGE_SIZE ( 1ul<<12) #define PAGE_SIZE ( 1ul<<12)
#endif //} #endif //}
@@ -412,12 +412,14 @@ static void *mmap(
"\tsw $8,0x10($29)\n" "\tsw $8,0x10($29)\n"
"\tsw $9,0x14($29)\n" "\tsw $9,0x14($29)\n"
"\tsyscall\n" "\tsyscall\n"
".set noreorder\n"
"\tb sysret_incl\n"
"\t addiu $29,$29, 0x20\n" "\t addiu $29,$29, 0x20\n"
"\tb sysret\n" ".set reorder\n"
"sysgo:" "sysgo_incl:"
/*"break\n"*/ /* debug only */ /*"break\n"*/ /* debug only */
"\tsyscall\n" "\tsyscall\n"
"sysret: .set noat\n" "sysret_incl: .set noat\n"
"\tsltiu $1,$7,1\n" /* 1: no error; 0: error; $7 == a3 */ "\tsltiu $1,$7,1\n" /* 1: no error; 0: error; $7 == a3 */
"\taddiu $1,$1,-1\n" /* 0: no error; -1: error */ "\taddiu $1,$1,-1\n" /* 0: no error; -1: error */
"\tor $2,$2,$1\n" /* $2 == v0; good result, else -1 for error */ "\tor $2,$2,$1\n" /* $2 == v0; good result, else -1 for error */
@@ -438,7 +440,7 @@ static ssize_t read(int fd, void *buf, size_t len)
register size_t const a2 asm("a2") = len; register size_t const a2 asm("a2") = len;
register size_t v0 asm("v0") = __NR_read; register size_t v0 asm("v0") = __NR_read;
__asm__ __volatile__( __asm__ __volatile__(
"bal sysgo" "bal sysgo_incl"
: "+r"(v0) : "+r"(v0)
: "r"(a0), "r"(a1), "r"(a2) : "r"(a0), "r"(a1), "r"(a2)
: "a3", "ra" : "a3", "ra"
@@ -454,7 +456,7 @@ static void *brk(void *addr)
register void *const a0 asm("a0") = addr; register void *const a0 asm("a0") = addr;
register void * v0 asm("v0") = (void *)__NR_brk; register void * v0 asm("v0") = (void *)__NR_brk;
__asm__ __volatile__( __asm__ __volatile__(
"bal sysgo" "bal sysgo_incl"
: "+r"(v0) : "+r"(v0)
: "r"(a0) : "r"(a0)
: "a3", "ra" : "a3", "ra"
@@ -470,7 +472,7 @@ static int close(int fd)
register int const a0 asm("a0") = fd; register int const a0 asm("a0") = fd;
register int v0 asm("v0") = __NR_close; register int v0 asm("v0") = __NR_close;
__asm__ __volatile__( __asm__ __volatile__(
"bal sysgo" "bal sysgo_incl"
: "+r"(v0) : "+r"(v0)
: "r"(a0) : "r"(a0)
: "a3", "ra" : "a3", "ra"
@@ -487,7 +489,7 @@ static void exit(int code)
register int const a0 asm("a0") = code; register int const a0 asm("a0") = code;
register int v0 asm("v0") = __NR_exit; register int v0 asm("v0") = __NR_exit;
__asm__ __volatile__( __asm__ __volatile__(
"bal sysgo" "bal sysgo_incl"
: :
: "r"(v0), "r"(a0) : "r"(v0), "r"(a0)
: "a3", "ra" : "a3", "ra"
@@ -504,7 +506,7 @@ static int munmap(void *addr, size_t len)
register size_t const a1 asm("a1") = len; register size_t const a1 asm("a1") = len;
register size_t v0 asm("v0") = __NR_munmap; register size_t v0 asm("v0") = __NR_munmap;
__asm__ __volatile__( __asm__ __volatile__(
"bal sysgo" "bal sysgo_incl"
: "+r"(v0) : "+r"(v0)
: "r"(a0), "r"(a1) : "r"(a0), "r"(a1)
: "a3", "ra" : "a3", "ra"
@@ -522,7 +524,7 @@ static int mprotect(void const *addr, size_t len, int prot)
register int const a2 asm("a2") = prot; register int const a2 asm("a2") = prot;
register size_t v0 asm("v0") = __NR_mprotect; register size_t v0 asm("v0") = __NR_mprotect;
__asm__ __volatile__( __asm__ __volatile__(
"bal sysgo" "bal sysgo_incl"
: "+r"(v0) : "+r"(v0)
: "r"(a0), "r"(a1), "r"(a2) : "r"(a0), "r"(a1), "r"(a2)
: "a3", "ra" : "a3", "ra"
@@ -540,7 +542,7 @@ static int msync(void const *addr, size_t len, int prot)
register int const a2 asm("a2") = prot; register int const a2 asm("a2") = prot;
register size_t v0 asm("v0") = __NR_msync; register size_t v0 asm("v0") = __NR_msync;
__asm__ __volatile__( __asm__ __volatile__(
"bal sysgo" "bal sysgo_incl"
: "+r"(v0) : "+r"(v0)
: "r"(a0), "r"(a1), "r"(a2) : "r"(a0), "r"(a1), "r"(a2)
: "a3", "ra" : "a3", "ra"
@@ -558,7 +560,7 @@ static ssize_t open(char const *path, int kind, int mode)
register int const a2 asm("a2") = mode; register int const a2 asm("a2") = mode;
register size_t v0 asm("v0") = __NR_open; register size_t v0 asm("v0") = __NR_open;
__asm__ __volatile__( __asm__ __volatile__(
"bal sysgo" "bal sysgo_incl"
: "+r"(v0) : "+r"(v0)
: "r"(a0), "r"(a1), "r"(a2) : "r"(a0), "r"(a1), "r"(a2)
: "a3", "ra" : "a3", "ra"
@@ -577,7 +579,7 @@ static ssize_t write(int fd, void const *buf, size_t len)
register size_t const a2 asm("a2") = len; register size_t const a2 asm("a2") = len;
register size_t v0 asm("v0") = __NR_write; register size_t v0 asm("v0") = __NR_write;
__asm__ __volatile__( __asm__ __volatile__(
"bal sysgo" "bal sysgo_incl"
: "+r"(v0) : "+r"(v0)
: "r"(a0), "r"(a1), "r"(a2) : "r"(a0), "r"(a1), "r"(a2)
: "a3", "ra" : "a3", "ra"
@@ -741,15 +743,15 @@ typedef struct
// !!! must be the same as in p_unix.h !!! // !!! must be the same as in p_unix.h !!!
#define OVERHEAD 2048 #define OVERHEAD 2048
#define UPX_MAGIC_LE32 0x21585055 // "UPX!" #define UPX_MAGIC_LE32 0x21585055 /* "UPX!" */
#if 1 #if 1
// patch constants for our loader (le32 format) // patch constants for our loader (le32 format)
//#define UPX1 0x31585055 // "UPX1" //#define UPX1 0x31585055 /* "UPX1" */
#define UPX2 0x32585055 // "UPX2" #define UPX2 0x32585055 /* "UPX2" */
#define UPX3 0x33585055 // "UPX4" #define UPX3 0x33585055 /* "UPX4" */
#define UPX4 0x34585055 // "UPX4" #define UPX4 0x34585055 /* "UPX4" */
//#define UPX5 0x35585055 // "UPX5" //#define UPX5 0x35585055 /* "UPX5" */
#else #else
// transform into relocations when using ElfLinker // transform into relocations when using ElfLinker
extern const unsigned UPX2; extern const unsigned UPX2;