win64: perform correct setjmp calls
PATCH 1/1 win64: perform correct setjmp calls
On w64, setjmp is implemented by _setjmp which needs a second parameter. This parameter should be NULL to allow using longjump from generated code. This patch replaces all usages of setjmp.h with new header files which replaces setjmp with _setjmp function on win64 platform.
--- coroutine-sigaltstack.c | 2 +- coroutine-ucontext.c | 2 +- disas/i386.c | 2 +- disas/m68k.c | 2 +- include/qom/cpu.h | 2 +- include/sysemu/os-win32.h | 17 ----------------- include/sysemu/setjmp.h | 35 +++++++++++++++++++++++++++++++++++ util/oslib-posix.c | 2 +- 8 files changed, 41 insertions(+), 23 deletions(-) create mode 100755 include/sysemu/setjmp.h
coroutine-sigaltstack.c +1 -1
@@ -26,7 +26,7 @@#undef _FORTIFY_SOURCE#endif #include <stdlib.h> -#include <setjmp.h> +#include "sysemu/setjmp.h" #include <stdint.h> #include <pthread.h> #include <signal.h>
coroutine-ucontext.c +1 -1
@@ -23,7 +23,7 @@#undef _FORTIFY_SOURCE#endif #include <stdlib.h> -#include <setjmp.h> +#include "sysemu/setjmp.h" #include <stdint.h> #include <ucontext.h> #include "qemu-common.h"
disas/i386.c +1 -1
@@ -153,7 +153,7 @@/* opcodes/i386-dis.c r1.126 */ #include "qemu-common.h" -#include <setjmp.h> +#include "sysemu/setjmp.h" static int fetch_data2 (struct disassemble_info *,bfd_byte *);static int fetch_data (struct disassemble_info *,bfd_byte *);
disas/m68k.c +1 -1
@@ -616,7 +616,7 @@ static const char *const reg_half_names[] =/* Maximum length of an instruction. */ #define MAXLEN 22 -#include <setjmp.h> +#include "sysemu/setjmp.h" struct private {
include/qom/cpu.h +1 -1
@@ -21,7 +21,7 @@#define QEMU_CPU_H #include <signal.h> -#include <setjmp.h> +#include "sysemu/setjmp.h" #include "hw/qdev-core.h" #include "exec/hwaddr.h" #include "qemu/queue.h"
include/sysemu/os-win32.h +0 -17
@@ -55,23 +55,6 @@# define EWOULDBLOCK WSAEWOULDBLOCK#endif -#if defined(_WIN64) -/* On w64, setjmp is implemented by _setjmp which needs a second parameter. -* If this parameter is NULL, longjump does no stack unwinding. -* That is what we need for QEMU. Passing the value of register rsp (default) -* lets longjmp try a stack unwinding which will crash with generated code. */ -# undef setjmp -# define setjmp (env) _setjmp(env, NULL) -#endif -/* QEMU uses sigsetjmp()/siglongjmp() as the portable way to specify -* "longjmp and don't touch the signal masks". Since we know that the -* savemask parameter will always be zero we can safely define these -* in terms of setjmp/longjmp on Win32. -*/ -#define sigjmp_buf jmp_buf -#define sigsetjmp (env, savemask) setjmp(env) -#define siglongjmp (env, val) longjmp(env, val) -/* Declaration of ffs() is missing in MinGW's strings.h. */ int ffs (int i);
include/sysemu/setjmp.h new file +35 -0
@@ -0,0 +1,35 @@ +/* +* setjmp.h +* +* Copyright (c) 2015 Institute for System Programming +* of the Russian Academy of Sciences. +* +* This work is licensed under the terms of the GNU GPL, version 2 or later. +* See the COPYING file in the top-level directory. +* +*/ +#ifndef QEMU_SETJMP_H +#define QEMU_SETJMP_H + +#include <setjmp.h> + +#if defined(_WIN32) +#if defined(_WIN64) +/* On w64, setjmp is implemented by _setjmp which needs a second parameter. +* If this parameter is NULL, longjump does no stack unwinding. +* That is what we need for QEMU. Passing the value of register rsp (default) +* lets longjmp try a stack unwinding which will crash with generated code. */ +# undef setjmp +# define setjmp (env) _setjmp(env, NULL) +#endif +/* QEMU uses sigsetjmp()/siglongjmp() as the portable way to specify +* "longjmp and don't touch the signal masks". Since we know that the +* savemask parameter will always be zero we can safely define these +* in terms of setjmp/longjmp on Win32. +*/ +#define sigjmp_buf jmp_buf +#define sigsetjmp (env, savemask) setjmp(env) +#define siglongjmp (env, val) longjmp(env, val) +#endif + +#endif
util/oslib-posix.c +1 -1
@@ -59,7 +59,7 @@ extern int daemon(int, int);#include "qemu/sockets.h" #include <sys/mman.h> #include <libgen.h> -#include <setjmp.h> +#include "sysemu/setjmp.h" #include <sys/signal.h> #ifdef CONFIG_LINUX
Am 09.02.2015 um 08:55 schrieb Pavel Dovgalyuk:
Quoted 8 lines
On w64, setjmp is implemented by
_setjmpwhich needs a second parameter. This parameter should be NULL to allow using longjump from generated code. This patch replaces all usages ofsetjmp.hwith new header files which replaces setjmp with_setjmpfunction on win64 platform.Signed-off-by Pavel Dovgalyuk <[email protected]>---
Please have a look at include/sysemu/os-win32.h. I think that your patch is not needed because the current code already uses _setjmp.
Regards
Stefan
Quoted 11 lines
From: Stefan Weil [mailto:[email protected]]
Am 09.02.2015 um 08:55 schrieb Pavel Dovgalyuk:Quoted 6 lines
On w64, setjmp is implemented by
_setjmpwhich needs a second parameter. This parameter should be NULL to allow using longjump from generated code. This patch replaces all usages ofsetjmp.hwith new header files which replaces setjmp with_setjmpfunction on win64 platform.Signed-off-by Pavel Dovgalyuk <[email protected]>Please have a look at
include/sysemu/os-win32.h. I think that your patch is not needed because the current code already uses_setjmp.
Right, but some of the files (e.g. include/qom/cpu.h) include setjmp.h directly. Then we have the following for compiling cpu-exec.c:
cpu-exec.c:
...os-win32.h
...setjmp.h
...
In this situation cpu-exec will call incorrect setjmp function.
Pavel Dovgalyuk
Am 09.02.2015 um 09:07 schrieb Pavel Dovgaluk:
Quoted 20 lines
Quoted 10 lines
From: Stefan Weil [mailto:[email protected]]
Am 09.02.2015 um 08:55 schrieb Pavel Dovgalyuk:Quoted 6 lines
On w64, setjmp is implemented by
_setjmpwhich needs a second parameter. This parameter should be NULL to allow using longjump from generated code. This patch replaces all usages ofsetjmp.hwith new header files which replaces setjmp with_setjmpfunction on win64 platform.Signed-off-by Pavel Dovgalyuk <[email protected]>Please have a look at
include/sysemu/os-win32.h. I think that your patch is not needed because the current code already uses_setjmp.Right, but some of the files (e.g.
include/qom/cpu.h) includesetjmp.hdirectly. Then we have the following for compilingcpu-exec.c:
cpu-exec.c:
...os-win32.h
...setjmp.h
...
Quoted 3 lines
In this situation cpu-exec will call incorrect setjmp function.
Pavel Dovgalyuk
It won't call the wrong setjmp function, at least not in my tests. cpu-exec.c gets the setjmp declaration from os-win32.h. Without it, QEMU would be unusable because it would crash very soon during the emulation.
Do you see problems caused by a wrong setjmp with latest QEMU? If yes: which build environment do you use (host, compiler, version of MinGW*)?
Quoted 27 lines
From: Stefan Weil [mailto:[email protected]]
Am 09.02.2015 um 09:07 schrieb Pavel Dovgaluk:Quoted 20 lines
Quoted 10 lines
From: Stefan Weil [mailto:[email protected]]
Am 09.02.2015 um 08:55 schrieb Pavel Dovgalyuk:Quoted 6 lines
On w64, setjmp is implemented by
_setjmpwhich needs a second parameter. This parameter should be NULL to allow using longjump from generated code. This patch replaces all usages ofsetjmp.hwith new header files which replaces setjmp with_setjmpfunction on win64 platform.Signed-off-by Pavel Dovgalyuk <[email protected]>Please have a look at
include/sysemu/os-win32.h. I think that your patch is not needed because the current code already uses_setjmp.Right, but some of the files (e.g.
include/qom/cpu.h) includesetjmp.hdirectly. Then we have the following for compilingcpu-exec.c:
cpu-exec.c:
...os-win32.h
...setjmp.h
...Quoted 3 lines
In this situation cpu-exec will call incorrect setjmp function.
Pavel Dovgalyuk
Quoted 6 lines
It won't call the wrong setjmp function, at least not in my tests.
cpu-exec.cgets the setjmp declaration fromos-win32.h. Without it, QEMU would be unusable because it would crash very soon during the emulation.Do you see problems caused by a wrong setjmp with latest QEMU? If yes:
which build environment do you use (host, compiler, version of MinGW*)?
Yes, I've got the problems. To verify the correctness of the call I disassembled cpu-exec.o and found that setjmp is called with second parameter not equal to zero.
I'm using Cygwin environment and packages from here: http://win-builds.org/
My host OS is Windows 7x64 and the compiler is x86_64-w64-mingw32-gcc.exe (GCC) 4.8.3
Pavel Dovgalyuk