Fixes VDSO crash in 64-bit code

Ever since #3406 this has been crashing. Struct tail padding was saving this before.
FEX-Emu · Feb 18, 2024 · 40f9f13 · 40f9f13
1 parent 5769ffb
commit 40f9f13
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/Source/Tools/LinuxEmulation/VDSO_Emulation.cpp b/Source/Tools/LinuxEmulation/VDSO_Emulation.cpp
@@ -36,7 +36,7 @@ namespace FEX::VDSO {
 
   using HandlerPtr = void(*)(void*);
   namespace x64 {
-    static uint64_t SyscallRet(int Result) {
+    static int SyscallRet(int Result) {
       if (Result == -1) {
         return -errno;
       }
@@ -47,7 +47,7 @@ namespace FEX::VDSO {
       static void time(void* ArgsRV) {
         struct __attribute__((packed)) ArgsRV_t {
           time_t *a_0;
-          uint64_t rv;
+          int rv;
         } *args = reinterpret_cast<ArgsRV_t*>(ArgsRV);
 
         int Result = ::time(args->a_0);
@@ -58,7 +58,7 @@ namespace FEX::VDSO {
         struct __attribute__((packed)) ArgsRV_t {
           struct timeval *tv;
           struct timezone *tz;
-          uint64_t rv;
+          int rv;
         } *args = reinterpret_cast<ArgsRV_t*>(ArgsRV);
 
         int Result = ::gettimeofday(args->tv, args->tz);
@@ -69,7 +69,7 @@ namespace FEX::VDSO {
         struct __attribute__((packed)) ArgsRV_t {
           clockid_t clk_id;
           struct timespec *tp;
-          uint64_t rv;
+          int rv;
         } *args = reinterpret_cast<ArgsRV_t*>(ArgsRV);
 
         int Result = ::clock_gettime(args->clk_id, args->tp);
@@ -80,7 +80,7 @@ namespace FEX::VDSO {
         struct __attribute__((packed)) ArgsRV_t {
           clockid_t clk_id;
           struct timespec *tp;
-          uint64_t rv;
+          int rv;
         } *args = reinterpret_cast<ArgsRV_t*>(ArgsRV);
 
         int Result = ::clock_getres(args->clk_id, args->tp);
@@ -91,7 +91,7 @@ namespace FEX::VDSO {
         struct __attribute__((packed)) ArgsRV_t {
           uint32_t *cpu;
           uint32_t *node;
-          uint64_t rv;
+          int rv;
         } *args = reinterpret_cast<ArgsRV_t*>(ArgsRV);
 
         int Result = FHU::Syscalls::getcpu(args->cpu, args->node);
@@ -104,7 +104,7 @@ namespace FEX::VDSO {
       static void time(void* ArgsRV) {
         struct __attribute__((packed)) ArgsRV_t {
           time_t *a_0;
-          uint64_t rv;
+          int rv;
         } *args = reinterpret_cast<ArgsRV_t*>(ArgsRV);
 
         args->rv = VDSOHandlers::TimePtr(args->a_0);
@@ -114,7 +114,7 @@ namespace FEX::VDSO {
         struct __attribute__((packed)) ArgsRV_t {
           struct timeval *tv;
           struct timezone *tz;
-          uint64_t rv;
+          int rv;
         } *args = reinterpret_cast<ArgsRV_t*>(ArgsRV);
 
         args->rv = VDSOHandlers::GetTimeOfDayPtr(args->tv, args->tz);
@@ -124,7 +124,7 @@ namespace FEX::VDSO {
         struct __attribute__((packed)) ArgsRV_t {
           clockid_t clk_id;
           struct timespec *tp;
-          uint64_t rv;
+          int rv;
         } *args = reinterpret_cast<ArgsRV_t*>(ArgsRV);
 
         args->rv = VDSOHandlers::ClockGetTimePtr(args->clk_id, args->tp);
@@ -134,7 +134,7 @@ namespace FEX::VDSO {
         struct __attribute__((packed)) ArgsRV_t {
           clockid_t clk_id;
           struct timespec *tp;
-          uint64_t rv;
+          int rv;
         } *args = reinterpret_cast<ArgsRV_t*>(ArgsRV);
 
         args->rv = VDSOHandlers::ClockGetResPtr(args->clk_id, args->tp);
@@ -144,7 +144,7 @@ namespace FEX::VDSO {
         struct __attribute__((packed)) ArgsRV_t {
           uint32_t *cpu;
           uint32_t *node;
-          uint64_t rv;
+          int rv;
         } *args = reinterpret_cast<ArgsRV_t*>(ArgsRV);
 
         args->rv = VDSOHandlers::GetCPUPtr(args->cpu, args->node);