izzy/xemu
0
0
Fork 0
mirror of https://github.com/izzy2lost/xemu.git synced 2026-07-06 00:20:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

linux-user: Rename TARGET_ERESTARTSYS to QEMU_ERESTARTSYS

Browse Source 
This value is fully internal to qemu, and so is not a TARGET define.
We use this as an extra marker for both host and target errno.

Reviewed-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson
2021-12-19 20:47:33 -08:00
parent 0a7e01904d
commit af254a2792
31 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
linux-user/aarch64/cpu_loop.c
+1 -1
View File
@@ -99,7 +99,7 @@ void cpu_loop(CPUARMState *env)
env->xregs[4],
env->xregs[5],
0, 0);
if (ret == -TARGET_ERESTARTSYS) {
if (ret == -QEMU_ERESTARTSYS) {
env->pc -= 4;
} else if (ret != -TARGET_QEMU_ESIGRETURN) {
env->xregs[0] = ret;
linux-user/alpha/cpu_loop.c
+1 -1
View File
@@ -98,7 +98,7 @@ void cpu_loop(CPUAlphaState *env)
env->ir[IR_A2], env->ir[IR_A3],
env->ir[IR_A4], env->ir[IR_A5],
0, 0);
if (sysret == -TARGET_ERESTARTSYS) {
if (sysret == -QEMU_ERESTARTSYS) {
env->pc -= 4;
break;
}
linux-user/arm/cpu_loop.c
+1 -1
View File
@@ -407,7 +407,7 @@ void cpu_loop(CPUARMState *env)
env->regs[4],
env->regs[5],
0, 0);
if (ret == -TARGET_ERESTARTSYS) {
if (ret == -QEMU_ERESTARTSYS) {
env->regs[15] -= env->thumb ? 2 : 4;
} else if (ret != -TARGET_QEMU_ESIGRETURN) {
env->regs[0] = ret;
linux-user/cris/cpu_loop.c
+1 -1
View File
@@ -50,7 +50,7 @@ void cpu_loop(CPUCRISState *env)
env->pregs[7],
env->pregs[11],
0, 0);
if (ret == -TARGET_ERESTARTSYS) {
if (ret == -QEMU_ERESTARTSYS) {
env->pc -= 2;
} else if (ret != -TARGET_QEMU_ESIGRETURN) {
env->regs[10] = ret;
linux-user/generic/target_errno_defs.h
+1 -1
View File
@@ -153,7 +153,7 @@
* after handling any pending signals. They match with the ones the guest
* kernel uses for the same purpose.
*/
#define TARGET_ERESTARTSYS 512 /* Restart system call (if SA_RESTART) */
#define QEMU_ERESTARTSYS 512 /* Restart system call (if SA_RESTART) */
/* QEMU internal, not visible to the guest. This is returned by the
* do_sigreturn() code after a successful sigreturn syscall, to indicate
linux-user/hexagon/cpu_loop.c
+1 -1
View File
@@ -55,7 +55,7 @@ void cpu_loop(CPUHexagonState *env)
env->gpr[4],
env->gpr[5],
0, 0);
if (ret == -TARGET_ERESTARTSYS) {
if (ret == -QEMU_ERESTARTSYS) {
env->gpr[HEX_REG_PC] -= 4;
} else if (ret != -TARGET_QEMU_ESIGRETURN) {
env->gpr[0] = ret;
linux-user/host/aarch64/safe-syscall.inc.S
+1 -2
View File
@@ -70,8 +70,7 @@ safe_syscall_end:
b safe_syscall_set_errno_tail
/* code path when we didn't execute the syscall */
2: mov w0, #TARGET_ERESTARTSYS
2: mov w0, #QEMU_ERESTARTSYS
b safe_syscall_set_errno_tail
.cfi_endproc
.size safe_syscall_base, .-safe_syscall_base
linux-user/host/arm/safe-syscall.inc.S
+1 -1
View File
@@ -81,7 +81,7 @@ safe_syscall_end:
pop { r4, r5, r6, r7, r8, pc }
/* code path when we didn't execute the syscall */
2: mov r0, #TARGET_ERESTARTSYS
2: mov r0, #QEMU_ERESTARTSYS
/* code path setting errno */
1: pop { r4, r5, r6, r7, r8, lr }
linux-user/host/i386/safe-syscall.inc.S
+1 -1
View File
@@ -94,7 +94,7 @@ safe_syscall_end:
jmp 1f
/* code path when we didn't execute the syscall */
2: mov $TARGET_ERESTARTSYS, %eax
2: mov $QEMU_ERESTARTSYS, %eax
/* code path setting errno */
1: pop %ebx
linux-user/host/mips/safe-syscall.inc.S
+1 -1
View File
@@ -127,7 +127,7 @@ safe_syscall_end:
PTR_ADDIU sp, sp, FRAME
.cfi_adjust_cfa_offset -FRAME
.cfi_restore s0
li v0, TARGET_ERESTARTSYS
li v0, QEMU_ERESTARTSYS
/* code path setting errno */
/*
linux-user/host/ppc64/safe-syscall.inc.S
+1 -1
View File
@@ -78,7 +78,7 @@ safe_syscall_end:
/* code path when we didn't execute the syscall */
2: ld 14, 16(1) /* restore r14 */
addi 3, 0, TARGET_ERESTARTSYS
addi 3, 0, QEMU_ERESTARTSYS
/* code path setting errno */
1: b safe_syscall_set_errno_tail
linux-user/host/riscv/safe-syscall.inc.S
+1 -1
View File
@@ -72,7 +72,7 @@ safe_syscall_end:
j safe_syscall_set_errno_tail
/* code path when we didn't execute the syscall */
2: li a0, TARGET_ERESTARTSYS
2: li a0, QEMU_ERESTARTSYS
j safe_syscall_set_errno_tail
.cfi_endproc
linux-user/host/s390x/safe-syscall.inc.S
+1 -1
View File
@@ -91,7 +91,7 @@ safe_syscall_end:
2: lg %r15,0(%r15) /* load back chain */
.cfi_adjust_cfa_offset -160
lmg %r6,%r15,48(%r15) /* load saved registers */
lghi %r2, TARGET_ERESTARTSYS
lghi %r2, QEMU_ERESTARTSYS
jg safe_syscall_set_errno_tail
.cfi_endproc
linux-user/host/sparc64/safe-syscall.inc.S
+1 -1
View File
@@ -78,7 +78,7 @@ safe_syscall_end:
nop
/* code path when we didn't execute the syscall */
2: set TARGET_ERESTARTSYS, %o0
2: set QEMU_ERESTARTSYS, %o0
/* code path setting errno */
1: mov %o7, %g1
linux-user/host/x86_64/safe-syscall.inc.S
+1 -1
View File
@@ -82,7 +82,7 @@ safe_syscall_end:
jmp 1f
/* code path when we didn't execute the syscall */
2: mov $TARGET_ERESTARTSYS, %eax
2: mov $QEMU_ERESTARTSYS, %eax
/* code path setting errno */
1: pop %rbp
linux-user/hppa/cpu_loop.c
+1 -1
View File
@@ -133,7 +133,7 @@ void cpu_loop(CPUHPPAState *env)
env->iaoq_f = env->gr[31];
env->iaoq_b = env->gr[31] + 4;
break;
case -TARGET_ERESTARTSYS:
case -QEMU_ERESTARTSYS:
case -TARGET_QEMU_ESIGRETURN:
break;
}
linux-user/i386/cpu_loop.c
+3 -3
View File
@@ -180,7 +180,7 @@ static void emulate_vsyscall(CPUX86State *env)
ret = do_syscall(env, syscall, env->regs[R_EDI], env->regs[R_ESI],
env->regs[R_EDX], env->regs[10], env->regs[8],
env->regs[9], 0, 0);
g_assert(ret != -TARGET_ERESTARTSYS);
g_assert(ret != -QEMU_ERESTARTSYS);
g_assert(ret != -TARGET_QEMU_ESIGRETURN);
if (ret == -TARGET_EFAULT) {
goto sigsegv;
@@ -223,7 +223,7 @@ void cpu_loop(CPUX86State *env)
env->regs[R_EDI],
env->regs[R_EBP],
0, 0);
if (ret == -TARGET_ERESTARTSYS) {
if (ret == -QEMU_ERESTARTSYS) {
env->eip -= 2;
} else if (ret != -TARGET_QEMU_ESIGRETURN) {
env->regs[R_EAX] = ret;
@@ -241,7 +241,7 @@ void cpu_loop(CPUX86State *env)
env->regs[8],
env->regs[9],
0, 0);
if (ret == -TARGET_ERESTARTSYS) {
if (ret == -QEMU_ERESTARTSYS) {
env->eip -= 2;
} else if (ret != -TARGET_QEMU_ESIGRETURN) {
env->regs[R_EAX] = ret;
linux-user/m68k/cpu_loop.c
+1 -1
View File
@@ -80,7 +80,7 @@ void cpu_loop(CPUM68KState *env)
env->dregs[5],
env->aregs[0],
0, 0);
if (ret == -TARGET_ERESTARTSYS) {
if (ret == -QEMU_ERESTARTSYS) {
env->pc -= 2;
} else if (ret != -TARGET_QEMU_ESIGRETURN) {
env->dregs[0] = ret;
linux-user/microblaze/cpu_loop.c
+1 -1
View File
@@ -53,7 +53,7 @@ void cpu_loop(CPUMBState *env)
env->regs[9],
env->regs[10],
0, 0);
if (ret == -TARGET_ERESTARTSYS) {
if (ret == -QEMU_ERESTARTSYS) {
/* Wind back to before the syscall. */
env->pc -= 4;
} else if (ret != -TARGET_QEMU_ESIGRETURN) {
linux-user/mips/cpu_loop.c
+1 -1
View File
@@ -141,7 +141,7 @@ done_syscall:
env->active_tc.gpr[8], env->active_tc.gpr[9],
env->active_tc.gpr[10], env->active_tc.gpr[11]);
# endif /* O32 */
if (ret == -TARGET_ERESTARTSYS) {
if (ret == -QEMU_ERESTARTSYS) {
env->active_tc.PC -= 4;
break;
}

Some files were not shown because too many files have changed in this diff Show More