Patchwork [2/5] linux-user: move read to own function

login
register
mail settings
Submitter riku.voipio@linaro.org
Date Oct. 12, 2012, 6:24 p.m.
Message ID <8268db7babe40fe26ffcd14ed5fb5dd44848ccb3.1350063473.git.riku.voipio@linaro.org>
Download mbox | patch
Permalink /patch/191174/
State New
Headers show

Comments

riku.voipio@linaro.org - Oct. 12, 2012, 6:24 p.m.
From: Riku Voipio <riku.voipio@linaro.org>

In preparations for for refactoring the main switch/case out

Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
 linux-user/syscall.c |   24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

Patch

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 0b077e7..497cae5 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5131,6 +5131,21 @@  static void do_exit(void *cpu_env, abi_long arg1)
     _exit(arg1);
 }
 
+static abi_long do_read(abi_long arg1, abi_long arg2, abi_long arg3)
+{
+    abi_long ret;
+    void *p;
+    if (arg3 == 0)
+        ret = 0;
+    else {
+        if (!(p = lock_user(VERIFY_WRITE, arg2, arg3, 0)))
+            return -EFAULT;
+        ret = read(arg1, p, arg3);
+        unlock_user(p, arg2, ret);
+    }
+    return ret;
+}
+
 /* do_syscall() should always have a single exit point at the end so
    that actions, such as logging of syscall results, can be performed.
    All errnos that do_syscall() returns must be -TARGET_<errcode>. */
@@ -5155,14 +5170,7 @@  abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
         do_exit(cpu_env, arg1);
         break;
     case TARGET_NR_read:
-        if (arg3 == 0)
-            ret = 0;
-        else {
-            if (!(p = lock_user(VERIFY_WRITE, arg2, arg3, 0)))
-                goto efault;
-            ret = get_errno(read(arg1, p, arg3));
-            unlock_user(p, arg2, ret);
-        }
+        ret = get_errno(do_read(arg1, arg2, arg3));
         break;
     case TARGET_NR_write:
         if (!(p = lock_user(VERIFY_READ, arg2, arg3, 1)))