Patchwork [RFC,24/28] target-xtensa: implement SIMCALL

login
register
mail settings
Submitter Max Filippov
Date May 4, 2011, 12:59 a.m.
Message ID <1304470768-16924-24-git-send-email-jcmvbkbc@gmail.com>
Download mbox | patch
Permalink /patch/93959/
State New
Headers show

Comments

Max Filippov - May 4, 2011, 12:59 a.m.
Tensilica iss provides support for applications running in freestanding
environment through SIMCALL command. It is used by Tensilica libc to
access argc/argv, for file I/O, etc.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
 target-xtensa/helpers.h   |    1 +
 target-xtensa/op_helper.c |    7 ++
 target-xtensa/simcall.c   |  157 +++++++++++++++++++++++++++++++++++++++++++++
 target-xtensa/translate.c |    2 +-
 4 files changed, 166 insertions(+), 1 deletions(-)
 create mode 100644 target-xtensa/simcall.c
Blue Swirl - May 4, 2011, 7:48 p.m.
On Wed, May 4, 2011 at 3:59 AM, Max Filippov <jcmvbkbc@gmail.com> wrote:
> Tensilica iss provides support for applications running in freestanding
> environment through SIMCALL command. It is used by Tensilica libc to
> access argc/argv, for file I/O, etc.
>
> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
> ---
>  target-xtensa/helpers.h   |    1 +
>  target-xtensa/op_helper.c |    7 ++
>  target-xtensa/simcall.c   |  157 +++++++++++++++++++++++++++++++++++++++++++++
>  target-xtensa/translate.c |    2 +-
>  4 files changed, 166 insertions(+), 1 deletions(-)
>  create mode 100644 target-xtensa/simcall.c
>
> diff --git a/target-xtensa/helpers.h b/target-xtensa/helpers.h
> index 7e212a3..55eb0d8 100644
> --- a/target-xtensa/helpers.h
> +++ b/target-xtensa/helpers.h
> @@ -11,6 +11,7 @@ DEF_HELPER_2(window_check, void, i32, i32)
>  DEF_HELPER_0(restore_owb, void)
>  DEF_HELPER_1(movsp, void, i32)
>  DEF_HELPER_1(wsr_lend, void, i32)
> +DEF_HELPER_0(simcall, void)
>  DEF_HELPER_0(dump_state, void)
>
>  #include "def-helper.h"
> diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c
> index f0690ee..68b1526 100644
> --- a/target-xtensa/op_helper.c
> +++ b/target-xtensa/op_helper.c
> @@ -264,6 +264,13 @@ void HELPER(wsr_lend)(uint32_t v)
>     }
>  }
>
> +#include "simcall.c"
> +
> +void HELPER(simcall)(void)
> +{
> +    simcall(env->regs);

Maybe this should be enabled only with -semihosting parameter, like
ARM and m68k. Consider for example what could happen if this would be
issued from userland when used with an OS.

> +}
> +
>  void HELPER(dump_state)(void)
>  {
>     cpu_dump_state(env, stderr, fprintf, 0);
> diff --git a/target-xtensa/simcall.c b/target-xtensa/simcall.c
> new file mode 100644
> index 0000000..3446275
> --- /dev/null
> +++ b/target-xtensa/simcall.c
> @@ -0,0 +1,157 @@
> +/*
> + * Copyright (c) 2011, Max Filippov, Motorola Solutions, Inc.
> + * All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions are met:
> + *     * Redistributions of source code must retain the above copyright
> + *       notice, this list of conditions and the following disclaimer.
> + *     * Redistributions in binary form must reproduce the above copyright
> + *       notice, this list of conditions and the following disclaimer in the
> + *       documentation and/or other materials provided with the distribution.
> + *     * Neither the name of the Motorola Solutions nor the
> + *       names of its contributors may be used to endorse or promote products
> + *       derived from this software without specific prior written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
> + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
> + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
> + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
> + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
> + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
> + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
> + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> + */
> +
> +#include <assert.h>
> +#include <errno.h>
> +#include <unistd.h>
> +#include <string.h>
> +#include <stddef.h>
> +
> +enum {
> +    SYS_exit = 1,
> +    SYS_read = 3,
> +    SYS_write = 4,
> +    SYS_open = 5,
> +    SYS_close = 6,
> +
> +    SYS_argc = 1000,
> +    SYS_argv_sz = 1001,
> +    SYS_argv = 1002,
> +    SYS_memset = 1004,

I think these names may easily conflict with system defines, please
use for example TARGET_SYS_exit etc.

> +};
> +
> +static void simcall(uint32_t regs[16])
> +{
> +    switch (regs[2]) {
> +    case SYS_exit:
> +        printf("exit(%d)\n", regs[3]);
> +        exit(regs[3]);
> +        break;
> +
> +    case SYS_read:
> +        {
> +            target_phys_addr_t len = regs[5];
> +            void *buf = cpu_physical_memory_map(regs[4], &len, 1);
> +
> +            if (buf) {
> +                regs[2] = read(regs[3], buf, len);
> +                regs[3] = errno;
> +                cpu_physical_memory_unmap(buf, len, 1, len);
> +            } else {
> +                regs[2] = -1;
> +                regs[3] = 0;
> +            }
> +        }
> +        break;
> +
> +    case SYS_write:
> +        {
> +            target_phys_addr_t len = regs[5];
> +            void *buf = cpu_physical_memory_map(regs[4], &len, 0);
> +
> +            if (buf) {
> +                regs[2] = write(regs[3], buf, len);
> +                regs[3] = errno;
> +                cpu_physical_memory_unmap(buf, len, 0, len);
> +            } else {
> +                regs[2] = -1;
> +                regs[3] = 0;
> +            }
> +        }
> +        break;
> +
> +    case SYS_open:
> +        {
> +            target_phys_addr_t len = 1024;
> +            void *buf = cpu_physical_memory_map(regs[3], &len, 0);
> +
> +            if (buf && strnlen((char *)buf, len) < len) {
> +                regs[2] = open((char *)buf, regs[4], regs[5]);
> +                regs[3] = errno;
> +            } else {
> +                regs[2] = -1;
> +                regs[3] = 0;
> +            }
> +        }
> +        break;
> +
> +    case SYS_close:
> +        if (regs[3] < 3) {
> +            regs[2] = regs[3] = 0;
> +        } else {
> +            regs[2] = close(regs[3]);
> +            regs[3] = errno;
> +        }
> +        break;
> +
> +    case SYS_argc:
> +        regs[2] = 1;
> +        regs[3] = 0;
> +        break;
> +
> +    case SYS_argv_sz:
> +        regs[2] = 128;
> +        regs[3] = 0;
> +        break;
> +
> +    case SYS_argv:
> +        {
> +            struct Argv {
> +                uint32_t argptr[2];
> +                char text[120];
> +            } argv = {
> +                {0, 0},
> +                "test"
> +            };
> +
> +            argv.argptr[0] = regs[3] + offsetof(struct Argv, text);
> +            cpu_memory_rw_debug(
> +                    env, regs[3], (uint8_t *)&argv, sizeof(argv), 1);
> +        }
> +        break;
> +
> +    case SYS_memset:
> +        {
> +            target_phys_addr_t len = regs[5];
> +            void *buf = cpu_physical_memory_map(regs[3], &len, 1);
> +
> +            assert(len == regs[5]);

The guest can probably trigger this assertion, which would not be safe.
Peter Maydell - May 4, 2011, 8:31 p.m.
On 4 May 2011 20:48, Blue Swirl <blauwirbel@gmail.com> wrote:
> On Wed, May 4, 2011 at 3:59 AM, Max Filippov <jcmvbkbc@gmail.com> wrote:
>> Tensilica iss provides support for applications running in freestanding
>> environment through SIMCALL command. It is used by Tensilica libc to
>> access argc/argv, for file I/O, etc.
>>
>> Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
>> ---
>>  target-xtensa/helpers.h   |    1 +
>>  target-xtensa/op_helper.c |    7 ++
>>  target-xtensa/simcall.c   |  157 +++++++++++++++++++++++++++++++++++++++++++++

The existing simcall/semihosting implementations
are in arm-semi.c and m68k-semi.c in the top level
directory. I think xtensa should do the same
(unless somebody wants to propose moving arm and
m68k instead...)

>> +void HELPER(simcall)(void)
>> +{
>> +    simcall(env->regs);
>
> Maybe this should be enabled only with -semihosting parameter, like
> ARM and m68k. Consider for example what could happen if this would be
> issued from userland when used with an OS.

+1 for consistency with arm/m68k. This applies more generally:
for example if there's any chance there might be a linux-user
implementation for xtensa then you want to use the softmmu-semi.h
helpers so the memory access will work in both setups.

m68k and ARM also both funnel semihosting through the interrupt/
exception mechanisms; I haven't figured out if there's a good
reason for that that would make it worth copying in xtensa :-)

>> +    SYS_exit = 1,

> I think these names may easily conflict with system defines, please
> use for example TARGET_SYS_exit etc.

Renaming's safe, but as it happens arm-semi.c has been
using SYS_EXIT &c with no problems, so I don't think it's
a big deal either way.

-- PMM

Patch

diff --git a/target-xtensa/helpers.h b/target-xtensa/helpers.h
index 7e212a3..55eb0d8 100644
--- a/target-xtensa/helpers.h
+++ b/target-xtensa/helpers.h
@@ -11,6 +11,7 @@  DEF_HELPER_2(window_check, void, i32, i32)
 DEF_HELPER_0(restore_owb, void)
 DEF_HELPER_1(movsp, void, i32)
 DEF_HELPER_1(wsr_lend, void, i32)
+DEF_HELPER_0(simcall, void)
 DEF_HELPER_0(dump_state, void)
 
 #include "def-helper.h"
diff --git a/target-xtensa/op_helper.c b/target-xtensa/op_helper.c
index f0690ee..68b1526 100644
--- a/target-xtensa/op_helper.c
+++ b/target-xtensa/op_helper.c
@@ -264,6 +264,13 @@  void HELPER(wsr_lend)(uint32_t v)
     }
 }
 
+#include "simcall.c"
+
+void HELPER(simcall)(void)
+{
+    simcall(env->regs);
+}
+
 void HELPER(dump_state)(void)
 {
     cpu_dump_state(env, stderr, fprintf, 0);
diff --git a/target-xtensa/simcall.c b/target-xtensa/simcall.c
new file mode 100644
index 0000000..3446275
--- /dev/null
+++ b/target-xtensa/simcall.c
@@ -0,0 +1,157 @@ 
+/*
+ * Copyright (c) 2011, Max Filippov, Motorola Solutions, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the Motorola Solutions nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <assert.h>
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <stddef.h>
+
+enum {
+    SYS_exit = 1,
+    SYS_read = 3,
+    SYS_write = 4,
+    SYS_open = 5,
+    SYS_close = 6,
+
+    SYS_argc = 1000,
+    SYS_argv_sz = 1001,
+    SYS_argv = 1002,
+    SYS_memset = 1004,
+};
+
+static void simcall(uint32_t regs[16])
+{
+    switch (regs[2]) {
+    case SYS_exit:
+        printf("exit(%d)\n", regs[3]);
+        exit(regs[3]);
+        break;
+
+    case SYS_read:
+        {
+            target_phys_addr_t len = regs[5];
+            void *buf = cpu_physical_memory_map(regs[4], &len, 1);
+
+            if (buf) {
+                regs[2] = read(regs[3], buf, len);
+                regs[3] = errno;
+                cpu_physical_memory_unmap(buf, len, 1, len);
+            } else {
+                regs[2] = -1;
+                regs[3] = 0;
+            }
+        }
+        break;
+
+    case SYS_write:
+        {
+            target_phys_addr_t len = regs[5];
+            void *buf = cpu_physical_memory_map(regs[4], &len, 0);
+
+            if (buf) {
+                regs[2] = write(regs[3], buf, len);
+                regs[3] = errno;
+                cpu_physical_memory_unmap(buf, len, 0, len);
+            } else {
+                regs[2] = -1;
+                regs[3] = 0;
+            }
+        }
+        break;
+
+    case SYS_open:
+        {
+            target_phys_addr_t len = 1024;
+            void *buf = cpu_physical_memory_map(regs[3], &len, 0);
+
+            if (buf && strnlen((char *)buf, len) < len) {
+                regs[2] = open((char *)buf, regs[4], regs[5]);
+                regs[3] = errno;
+            } else {
+                regs[2] = -1;
+                regs[3] = 0;
+            }
+        }
+        break;
+
+    case SYS_close:
+        if (regs[3] < 3) {
+            regs[2] = regs[3] = 0;
+        } else {
+            regs[2] = close(regs[3]);
+            regs[3] = errno;
+        }
+        break;
+
+    case SYS_argc:
+        regs[2] = 1;
+        regs[3] = 0;
+        break;
+
+    case SYS_argv_sz:
+        regs[2] = 128;
+        regs[3] = 0;
+        break;
+
+    case SYS_argv:
+        {
+            struct Argv {
+                uint32_t argptr[2];
+                char text[120];
+            } argv = {
+                {0, 0},
+                "test"
+            };
+
+            argv.argptr[0] = regs[3] + offsetof(struct Argv, text);
+            cpu_memory_rw_debug(
+                    env, regs[3], (uint8_t *)&argv, sizeof(argv), 1);
+        }
+        break;
+
+    case SYS_memset:
+        {
+            target_phys_addr_t len = regs[5];
+            void *buf = cpu_physical_memory_map(regs[3], &len, 1);
+
+            assert(len == regs[5]);
+
+            if (buf) {
+                memset(buf, regs[4], len);
+                regs[2] = regs[3];
+                regs[3] = 0;
+                cpu_physical_memory_unmap(buf, len, 1, len);
+            }
+        }
+        break;
+
+    default:
+        printf("%s(%d)\n", __func__, regs[2]);
+        break;
+    }
+}
diff --git a/target-xtensa/translate.c b/target-xtensa/translate.c
index d63f53a..ab86db8 100644
--- a/target-xtensa/translate.c
+++ b/target-xtensa/translate.c
@@ -566,7 +566,7 @@  static void disas_xtensa_insn(DisasContext *dc)
                         break;
 
                     case 1: /*SIMCALL*/
-                        TBD();
+                        gen_helper_simcall();
                         break;
 
                     default: