[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 08/13] linux-user: Enable NPTL for m68k
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH v3 08/13] linux-user: Enable NPTL for m68k |
Date: |
Tue, 16 Jul 2013 18:44:55 +0100 |
For m68k, per-thread data is a purely kernel construct with no
CPU level support. Implement it via a field in the TaskState structure,
used by cpu_set_tls() and the set_thread_area/get_thread_area
syscalls. This allows us to enable compilation with NPTL.
Signed-off-by: Peter Maydell <address@hidden>
---
configure | 1 -
linux-user/m68k/target_cpu.h | 6 +++++-
linux-user/qemu.h | 1 +
linux-user/syscall.c | 12 ++++++++++++
4 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 117191e..67e6437 100755
--- a/configure
+++ b/configure
@@ -4203,7 +4203,6 @@ case "$target_name" in
m68k)
bflt="yes"
gdb_xml_files="cf-core.xml cf-fp.xml"
- target_nptl="no"
;;
microblaze|microblazeel)
TARGET_ARCH=microblaze
diff --git a/linux-user/m68k/target_cpu.h b/linux-user/m68k/target_cpu.h
index 8a2a305..cad9c90 100644
--- a/linux-user/m68k/target_cpu.h
+++ b/linux-user/m68k/target_cpu.h
@@ -29,6 +29,10 @@ static inline void cpu_clone_regs(CPUM68KState *env,
target_ulong newsp)
env->dregs[0] = 0;
}
-/* TODO: need to implement cpu_set_tls() */
+static inline void cpu_set_tls(CPUM68KState *env, target_ulong newtls)
+{
+ TaskState *ts = env->opaque;
+ ts->tp_value = newtls;
+}
#endif
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index 8c420da..1ff0fa8 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -121,6 +121,7 @@ typedef struct TaskState {
#endif
#ifdef TARGET_M68K
int sim_syscalls;
+ abi_ulong tp_value;
#endif
#if defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_UNICORE32)
/* Extra fields for semihosted binaries. */
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 00a0390..9619656 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8558,6 +8558,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long
arg1,
#elif defined(TARGET_I386) && defined(TARGET_ABI32)
ret = do_set_thread_area(cpu_env, arg1);
break;
+#elif defined(TARGET_M68K)
+ {
+ TaskState *ts = ((CPUArchState *)cpu_env)->opaque;
+ ts->tp_value = arg1;
+ break;
+ }
#else
goto unimplemented_nowarn;
#endif
@@ -8566,6 +8572,12 @@ abi_long do_syscall(void *cpu_env, int num, abi_long
arg1,
case TARGET_NR_get_thread_area:
#if defined(TARGET_I386) && defined(TARGET_ABI32)
ret = do_get_thread_area(cpu_env, arg1);
+#elif defined(TARGET_M68K)
+ {
+ TaskState *ts = ((CPUArchState *)cpu_env)->opaque;
+ ret = ts->tp_value;
+ break;
+ }
#else
goto unimplemented_nowarn;
#endif
--
1.7.9.5
- [Qemu-devel] [PATCH v3 00/13] linux-user: enable NPTL on everything, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 12/13] linux-user: Enable NPTL for x86-64, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 03/13] configure: Enable threading on all ppc and mips linux-user targets, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 06/13] linux-user: Enable NPTL for OpenRISC, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 05/13] linux-user: Move includes of target-specific headers to end of qemu.h, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 08/13] linux-user: Enable NPTL for m68k,
Peter Maydell <=
- [Qemu-devel] [PATCH v3 01/13] configure: Flip default of target_nptl, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 11/13] linux-user: Add i386 TLS setter, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 02/13] configure: Don't say target_nptl="no" if there is no linux-user target, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 10/13] linux-user: Clean up handling of clone() argument order, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 07/13] linux-user: Enable NPTL for SPARC targets, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 09/13] linux-user: Add missing 'break' in i386 get_thread_area syscall, Peter Maydell, 2013/07/16
- [Qemu-devel] [PATCH v3 04/13] configure: Enable threading for unicore32-linux-user, Peter Maydell, 2013/07/16