Patchwork [2/2] microblaze: Update PC before simulating syscall

login
register
mail settings
Submitter Edgar Iglesias
Date Oct. 17, 2012, 10:42 a.m.
Message ID <1350470544-14425-2-git-send-email-edgar.iglesias@gmail.com>
Download mbox | patch
Permalink /patch/192025/
State New
Headers show

Comments

Edgar Iglesias - Oct. 17, 2012, 10:42 a.m.
From: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>

Fixes a clone() emulation bug were the new thread starts
at the point of the syscall and thus clones in a loop.

Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
---
 linux-user/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/linux-user/main.c b/linux-user/main.c
index f4bbe69..5827ee6 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -2527,6 +2527,7 @@  void cpu_loop(CPUMBState *env)
         case EXCP_BREAK:
             /* Return address is 4 bytes after the call.  */
             env->regs[14] += 4;
+            env->sregs[SR_PC] = env->regs[14];
             ret = do_syscall(env, 
                              env->regs[12], 
                              env->regs[5], 
@@ -2537,7 +2538,6 @@  void cpu_loop(CPUMBState *env)
                              env->regs[10],
                              0, 0);
             env->regs[3] = ret;
-            env->sregs[SR_PC] = env->regs[14];
             break;
         case EXCP_HW_EXCP:
             env->regs[17] = env->sregs[SR_PC] + 4;