target/xtensa: linux-user: add call0 ABI support
PATCH 1/1 target/xtensa: linux-user: add call0 ABI support
Xtensa binaries built for call0 ABI don't rotate register window on function calls and returns. Invocation of signal handlers from the kernel is therefore different in windowed and call0 ABIs. There's currently no way to determine xtensa ELF binary ABI from the binary itself. Provide an environment variable QEMU_XTENSA_ABI_CALL0 and use it to initialize PS.WOE in xtensa_cpu_reset. Check this flag in setup_rt_frame to determine how a signal should be delivered.
--- linux-user/xtensa/signal.c | 25 +++++++++++++++++-------- target/xtensa/cpu.c | 22 ++++++++++++++++++---- 2 files changed, 35 insertions(+), 12 deletions(-)
linux-user/xtensa/signal.c +17 -8
@@ -134,6 +134,8 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,abi_ulong frame_addr;struct target_rt_sigframe *frame;uint32_t ra; +bool abi_call0; +unsigned base;int i; frame_addr =get_sigframe (ka, env,sizeof (*frame));
@@ -182,20 +184,27 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,__put_user (0x00 , &frame->retcode[5 ]);#endif } - env->sregs[PS ] =PS_UM | (3 <<PS_RING_SHIFT ); -if (xtensa_option_enabled (env->config,XTENSA_OPTION_WINDOWED_REGISTER )) { - env->sregs[PS ] |=PS_WOE | (1 <<PS_CALLINC_SHIFT ); - }memset (env->regs,0 ,sizeof (env->regs)); env->pc = ka->_sa_handler; env->regs[1 ] = frame_addr; env->sregs[WINDOW_BASE ] =0 ; env->sregs[WINDOW_START ] =1 ; - env->regs[4 ] = (ra &0x3fffffff ) |0x40000000 ; - env->regs[6 ] = sig; - env->regs[7 ] = frame_addr + offsetof(struct target_rt_sigframe , info); - env->regs[8 ] = frame_addr + offsetof(struct target_rt_sigframe , uc); + abi_call0 = (env->sregs[PS ] &PS_WOE ) ==0 ; + env->sregs[PS ] =PS_UM | (3 <<PS_RING_SHIFT ); + +if (abi_call0) { + base =0 ; + env->regs[base] = ra; + }else { + env->sregs[PS ] |=PS_WOE | (1 <<PS_CALLINC_SHIFT ); + base =4 ; + env->regs[base] = (ra &0x3fffffff ) |0x40000000 ; + } + env->regs[base +2 ] = sig; + env->regs[base +3 ] = frame_addr + offsetof(struct target_rt_sigframe , + info); + env->regs[base +4 ] = frame_addr + offsetof(struct target_rt_sigframe , uc);unlock_user_struct (frame, frame_addr,1 );return ;
target/xtensa/cpu.c +18 -4
@@ -53,6 +53,18 @@ static bool xtensa_cpu_has_work(CPUState *cs)#endif } +#ifdef CONFIG_USER_ONLY +static int xtensa_abi_call0 (void ) +{ +static int abi_call0 =-1 ; + +if (abi_call0 ==-1 ) { + abi_call0 =getenv ("QEMU_XTENSA_ABI_CALL0" ) !=NULL ; + } +return abi_call0; +} +#endif +/* CPUClass::reset() */ static void xtensa_cpu_reset (CPUState *s) {
@@ -70,10 +82,12 @@ static void xtensa_cpu_reset(CPUState *s) XTENSA_OPTION_INTERRUPT) ? 0x1f : 0x10; env->pending_irq_level =0 ;#else - env->sregs[PS ] = - (xtensa_option_enabled (env->config, -XTENSA_OPTION_WINDOWED_REGISTER ) ?PS_WOE :0 ) | -PS_UM | (3 <<PS_RING_SHIFT ); + env->sregs[PS ] =PS_UM | (3 <<PS_RING_SHIFT ); +if (xtensa_option_enabled (env->config, +XTENSA_OPTION_WINDOWED_REGISTER ) && + !xtensa_abi_call0 ()) { + env->sregs[PS ] |=PS_WOE ; + }#endif env->sregs[VECBASE ] = env->config->vecbase; env->sregs[IBREAKENABLE ] =0 ;
Signature · 1 line
2.11.0
Le 26/08/2019 à 00:17, Max Filippov a écrit :
Quoted 36 lines
Xtensa binaries built for call0 ABI don't rotate register window on function calls and returns. Invocation of signal handlers from the kernel is therefore different in windowed and call0 ABIs. There's currently no way to determine xtensa ELF binary ABI from the binary itself. Provide an environment variable
QEMU_XTENSA_ABI_CALL0and use it to initialize PS.WOE inxtensa_cpu_reset. Check this flag insetup_rt_frameto determine how a signal should be delivered.Signed-off-by Max Filippov <[email protected]>--- linux-user/xtensa/signal.c | 25 +++++++++++++++++-------- target/xtensa/cpu.c | 22 ++++++++++++++++++---- 2 files changed, 35 insertions(+), 12 deletions(-)linux-user/xtensa/signal.c +2
-4@@ -134,6 +134,8 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,abi_ulong frame_addr;struct target_rt_sigframe *frame;uint32_t ra; +bool abi_call0; +unsigned base;int i; frame_addr =get_sigframe (ka, env,sizeof (*frame));@@ -182,20 +184,27 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,__put_user (0x00 , &frame->retcode[5 ]);#endif } - env->sregs[PS ] =PS_UM | (3 <<PS_RING_SHIFT ); -if (xtensa_option_enabled (env->config,XTENSA_OPTION_WINDOWED_REGISTER )) { - env->sregs[PS ] |=PS_WOE | (1 <<PS_CALLINC_SHIFT ); - }memset (env->regs,0 ,sizeof (env->regs));
linux-user/xtensa/signal.c void setup_rt_frame(int sig, struct target_sigaction *ka, · line 193
Quoted 10 lines
linux-user/xtensa/signal.c +1
-4env->pc = ka->_sa_handler; env->regs[1 ] = frame_addr; env->sregs[WINDOW_BASE ] =0 ; env->sregs[WINDOW_START ] =1 ; - env->regs[4 ] = (ra &0x3fffffff ) |0x40000000 ; - env->regs[6 ] = sig; - env->regs[7 ] = frame_addr + offsetof(struct target_rt_sigframe , info); - env->regs[8 ] = frame_addr + offsetof(struct target_rt_sigframe , uc); + abi_call0 = (env->sregs[PS ] &PS_WOE ) ==0 ;
Is this safe to rely on content of sregs[PS]?
Why don't you use xtensa_abi_call0()?
Quoted 22 lines
linux-user/xtensa/signal.c +14
-0+ env->sregs[PS ] =PS_UM | (3 <<PS_RING_SHIFT ); + +if (abi_call0) { + base =0 ; + env->regs[base] = ra; + }else { + env->sregs[PS ] |=PS_WOE | (1 <<PS_CALLINC_SHIFT ); + base =4 ; + env->regs[base] = (ra &0x3fffffff ) |0x40000000 ; + } + env->regs[base +2 ] = sig; + env->regs[base +3 ] = frame_addr + offsetof(struct target_rt_sigframe , + info); + env->regs[base +4 ] = frame_addr + offsetof(struct target_rt_sigframe , uc);unlock_user_struct (frame, frame_addr,1 );return ;target/xtensa/cpu.c +0
-0
target/xtensa/cpu.c static bool xtensa_cpu_has_work(CPUState *cs) · line 62
Quoted 10 lines
target/xtensa/cpu.c +7
-0@@ -53,6 +53,18 @@ static bool xtensa_cpu_has_work(CPUState *cs)#endif } +#ifdef CONFIG_USER_ONLY +static int xtensa_abi_call0 (void ) +{ +static int abi_call0 =-1 ; + +if (abi_call0 ==-1 ) { + abi_call0 =getenv ("QEMU_XTENSA_ABI_CALL0" ) !=NULL ;
Wouldn't it be cleaner to add this in the arg_table[] in linux-user/main.c and then use directly the variable?
Thanks,
Laurent
Quoted 43 lines · Laurent Vivier
Quoted 41 lines · Max Filippov
Xtensa binaries built for call0 ABI don't rotate register window on function calls and returns. Invocation of signal handlers from the kernel is therefore different in windowed and call0 ABIs. There's currently no way to determine xtensa ELF binary ABI from the binary itself. Provide an environment variable
QEMU_XTENSA_ABI_CALL0and use it to initialize PS.WOE inxtensa_cpu_reset. Check this flag insetup_rt_frameto determine how a signal should be delivered.Signed-off-by Max Filippov <[email protected]>--- linux-user/xtensa/signal.c | 25 +++++++++++++++++-------- target/xtensa/cpu.c | 22 ++++++++++++++++++---- 2 files changed, 35 insertions(+), 12 deletions(-)linux-user/xtensa/signal.c +2
-4@@ -134,6 +134,8 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,abi_ulong frame_addr;struct target_rt_sigframe *frame;uint32_t ra; +bool abi_call0; +unsigned base;int i; frame_addr =get_sigframe (ka, env,sizeof (*frame));@@ -182,20 +184,27 @@ void setup_rt_frame(int sig, struct target_sigaction *ka,__put_user (0x00 , &frame->retcode[5 ]);#endif } - env->sregs[PS ] =PS_UM | (3 <<PS_RING_SHIFT ); -if (xtensa_option_enabled (env->config,XTENSA_OPTION_WINDOWED_REGISTER )) { - env->sregs[PS ] |=PS_WOE | (1 <<PS_CALLINC_SHIFT ); - }memset (env->regs,0 ,sizeof (env->regs)); env->pc = ka->_sa_handler; env->regs[1 ] = frame_addr; env->sregs[WINDOW_BASE ] =0 ; env->sregs[WINDOW_START ] =1 ;
Quoted 7 lines
linux-user/xtensa/signal.c void setup_rt_frame(int sig, struct target_sigaction *ka, · line 193
Quoted 5 lines
linux-user/xtensa/signal.c +1
-4- env->regs[4 ] = (ra &0x3fffffff ) |0x40000000 ; - env->regs[6 ] = sig; - env->regs[7 ] = frame_addr + offsetof(struct target_rt_sigframe , info); - env->regs[8 ] = frame_addr + offsetof(struct target_rt_sigframe , uc); + abi_call0 = (env->sregs[PS ] &PS_WOE ) ==0 ;Is this safe to rely on content of sregs[PS]?
It should be: PS is a privileged register, PS.WOE can only be changed explicitly and windowed registers are not supposed to work when PS.WOE is cleared.
Quoted 1 line
Why don't you use
xtensa_abi_call0()?
I actually used it in early version of this change, but then decided that PS.WOE might be a better indicator for the call0 ABI.
Quoted 25 lines
Quoted 25 lines
linux-user/xtensa/signal.c +14
-0+ env->sregs[PS ] =PS_UM | (3 <<PS_RING_SHIFT ); + +if (abi_call0) { + base =0 ; + env->regs[base] = ra; + }else { + env->sregs[PS ] |=PS_WOE | (1 <<PS_CALLINC_SHIFT ); + base =4 ; + env->regs[base] = (ra &0x3fffffff ) |0x40000000 ; + } + env->regs[base +2 ] = sig; + env->regs[base +3 ] = frame_addr + offsetof(struct target_rt_sigframe , + info); + env->regs[base +4 ] = frame_addr + offsetof(struct target_rt_sigframe , uc);unlock_user_struct (frame, frame_addr,1 );return ;target/xtensa/cpu.c +0
-0@@ -53,6 +53,18 @@ static bool xtensa_cpu_has_work(CPUState *cs)#endif }
Quoted 10 lines
target/xtensa/cpu.c static bool xtensa_cpu_has_work(CPUState *cs) · line 62
Quoted 7 lines
target/xtensa/cpu.c +7
-0+#ifdef CONFIG_USER_ONLY +static int xtensa_abi_call0 (void ) +{ +static int abi_call0 =-1 ; + +if (abi_call0 ==-1 ) { + abi_call0 =getenv ("QEMU_XTENSA_ABI_CALL0" ) !=NULL ;Wouldn't it be cleaner to add this in the arg_table[] in
linux-user/main.cand then use directly the variable?
Probably. Will do so in v2.
Signature · 2 lines
Thanks. -- Max