From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 20 Jan 2015 15:19:33 +0000 (+0000)
Subject: linux-user/main.c (m68k): Use get_user_u16 rather than lduw in cpu_loop
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d8d5119cae38da090b7a76f22cecc8088691ab49;p=qemu.git

linux-user/main.c (m68k): Use get_user_u16 rather than lduw in cpu_loop

In the m68k cpu_loop() use get_user_u16 to read the immediate for
the simcall rahter than lduw, to bring it into line with how other
archs do it and to remove another user of the ldl family of functions.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 1421334118-3287-8-git-send-email-peter.maydell@linaro.org
---

diff --git a/linux-user/main.c b/linux-user/main.c
index ac39ff5493..8c70be4c1b 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -2972,7 +2972,7 @@ void cpu_loop(CPUM68KState *env)
             {
                 if (ts->sim_syscalls) {
                     uint16_t nr;
-                    nr = lduw(env->pc + 2);
+                    get_user_u16(nr, env->pc + 2);
                     env->pc += 4;
                     do_m68k_simcall(env, nr);
                 } else {