Re: [Qemu-devel] [PATCH 1/2] linux-user: Drop unicore32 code

2018-03-09 Thread Laurent Vivier 
Le 08/03/2018 à 15:47, Peter Maydell a écrit :
> We dropped the unicore32-linux-user target in commit 5e2b40f7271cf9
> in 2016. Nobody has made any attempt to fix the issues that
> caused us to drop it, so remove the associated code.
> (The system emulation parts of unicore32 remain.)
> 
> Signed-off-by: Peter Maydell 
> ---
>  linux-user/qemu.h |   5 +-
>  linux-user/syscall_defs.h |   6 +-
>  linux-user/unicore32/syscall_nr.h | 371 
> --
>  linux-user/unicore32/target_cpu.h |  27 ---
>  linux-user/unicore32/target_elf.h |  14 --
>  linux-user/unicore32/target_signal.h  |  30 ---
>  linux-user/unicore32/target_structs.h |  58 --
>  linux-user/unicore32/target_syscall.h |  62 --
>  linux-user/unicore32/termbits.h   |   2 -
>  linux-user/elfload.c  |  72 ---
>  linux-user/main.c |  99 +
>  linux-user/signal.c   |   5 +-
>  12 files changed, 6 insertions(+), 745 deletions(-)
>  delete mode 100644 linux-user/unicore32/syscall_nr.h
>  delete mode 100644 linux-user/unicore32/target_cpu.h
>  delete mode 100644 linux-user/unicore32/target_elf.h
>  delete mode 100644 linux-user/unicore32/target_signal.h
>  delete mode 100644 linux-user/unicore32/target_structs.h
>  delete mode 100644 linux-user/unicore32/target_syscall.h
>  delete mode 100644 linux-user/unicore32/termbits.h
> 

Applied to my 'linux-user-for-2.12' branch.

Thanks,
Laurent

Re: [Qemu-devel] [PATCH 1/2] linux-user: Drop unicore32 code

2018-03-08 Thread Laurent Vivier 
Le 08/03/2018 à 15:47, Peter Maydell a écrit :
> We dropped the unicore32-linux-user target in commit 5e2b40f7271cf9
> in 2016. Nobody has made any attempt to fix the issues that
> caused us to drop it, so remove the associated code.
> (The system emulation parts of unicore32 remain.)
> 
> Signed-off-by: Peter Maydell 
> ---
>  linux-user/qemu.h |   5 +-
>  linux-user/syscall_defs.h |   6 +-
>  linux-user/unicore32/syscall_nr.h | 371 
> --
>  linux-user/unicore32/target_cpu.h |  27 ---
>  linux-user/unicore32/target_elf.h |  14 --
>  linux-user/unicore32/target_signal.h  |  30 ---
>  linux-user/unicore32/target_structs.h |  58 --
>  linux-user/unicore32/target_syscall.h |  62 --
>  linux-user/unicore32/termbits.h   |   2 -
>  linux-user/elfload.c  |  72 ---
>  linux-user/main.c |  99 +
>  linux-user/signal.c   |   5 +-
>  12 files changed, 6 insertions(+), 745 deletions(-)
>  delete mode 100644 linux-user/unicore32/syscall_nr.h
>  delete mode 100644 linux-user/unicore32/target_cpu.h
>  delete mode 100644 linux-user/unicore32/target_elf.h
>  delete mode 100644 linux-user/unicore32/target_signal.h
>  delete mode 100644 linux-user/unicore32/target_structs.h
>  delete mode 100644 linux-user/unicore32/target_syscall.h
>  delete mode 100644 linux-user/unicore32/termbits.h
> 

Reviewed-by: Laurent Vivier

[Qemu-devel] [PATCH 1/2] linux-user: Drop unicore32 code

2018-03-08 Thread Peter Maydell 
We dropped the unicore32-linux-user target in commit 5e2b40f7271cf9
in 2016. Nobody has made any attempt to fix the issues that
caused us to drop it, so remove the associated code.
(The system emulation parts of unicore32 remain.)

Signed-off-by: Peter Maydell 
---
 linux-user/qemu.h |   5 +-
 linux-user/syscall_defs.h |   6 +-
 linux-user/unicore32/syscall_nr.h | 371 --
 linux-user/unicore32/target_cpu.h |  27 ---
 linux-user/unicore32/target_elf.h |  14 --
 linux-user/unicore32/target_signal.h  |  30 ---
 linux-user/unicore32/target_structs.h |  58 --
 linux-user/unicore32/target_syscall.h |  62 --
 linux-user/unicore32/termbits.h   |   2 -
 linux-user/elfload.c  |  72 ---
 linux-user/main.c |  99 +
 linux-user/signal.c   |   5 +-
 12 files changed, 6 insertions(+), 745 deletions(-)
 delete mode 100644 linux-user/unicore32/syscall_nr.h
 delete mode 100644 linux-user/unicore32/target_cpu.h
 delete mode 100644 linux-user/unicore32/target_elf.h
 delete mode 100644 linux-user/unicore32/target_signal.h
 delete mode 100644 linux-user/unicore32/target_structs.h
 delete mode 100644 linux-user/unicore32/target_syscall.h
 delete mode 100644 linux-user/unicore32/termbits.h

diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index f4b4ca72ad..7a1a1ff57a 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -100,9 +100,6 @@ typedef struct TaskState {
 # endif
 int swi_errno;
 #endif
-#ifdef TARGET_UNICORE32
-int swi_errno;
-#endif
 #if defined(TARGET_I386) && !defined(TARGET_X86_64)
 abi_ulong target_v86;
 struct vm86_saved_state vm86_saved_regs;
@@ -115,7 +112,7 @@ typedef struct TaskState {
 int sim_syscalls;
 abi_ulong tp_value;
 #endif
-#if defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_UNICORE32)
+#if defined(TARGET_ARM) || defined(TARGET_M68K)
 /* Extra fields for semihosted binaries.  */
 abi_ulong heap_base;
 abi_ulong heap_limit;
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index a35c52a60a..3cce4dabf7 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -69,7 +69,7 @@
 
 #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SH4) \
 || defined(TARGET_M68K) || defined(TARGET_CRIS) \
-|| defined(TARGET_UNICORE32) || defined(TARGET_S390X) \
+|| defined(TARGET_S390X) \
 || defined(TARGET_OPENRISC) || defined(TARGET_TILEGX) \
 || defined(TARGET_NIOS2)
 
@@ -433,7 +433,7 @@ int do_sigaction(int sig, const struct target_sigaction 
*act,
 #if defined(TARGET_I386) || defined(TARGET_ARM) || defined(TARGET_SPARC) \
 || defined(TARGET_PPC) || defined(TARGET_MIPS) || defined(TARGET_SH4) \
 || defined(TARGET_M68K) || defined(TARGET_ALPHA) || defined(TARGET_CRIS) \
-|| defined(TARGET_MICROBLAZE) || defined(TARGET_UNICORE32) \
+|| defined(TARGET_MICROBLAZE) \
 || defined(TARGET_S390X) || defined(TARGET_OPENRISC) \
 || defined(TARGET_TILEGX) || defined(TARGET_HPPA) || defined(TARGET_NIOS2)
 
@@ -1408,7 +1408,7 @@ struct target_winsize {
 
 #if (defined(TARGET_I386) && defined(TARGET_ABI32)) \
 || (defined(TARGET_ARM) && defined(TARGET_ABI32)) \
-|| defined(TARGET_CRIS) || defined(TARGET_UNICORE32)
+|| defined(TARGET_CRIS)
 struct target_stat {
unsigned short st_dev;
unsigned short __pad1;
diff --git a/linux-user/unicore32/syscall_nr.h 
b/linux-user/unicore32/syscall_nr.h
deleted file mode 100644
index 486b8c45a0..00
--- a/linux-user/unicore32/syscall_nr.h
+++ /dev/null
@@ -1,371 +0,0 @@
-/*
- * This file contains the system call numbers for UniCore32 oldabi.
- *
- * Copyright (C) 2010-2011 GUAN Xue-tao
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#define TARGET_NR_restart_syscall   0
-#define TARGET_NR_exit  1
-#define TARGET_NR_fork  2
-#define TARGET_NR_read  3
-#define TARGET_NR_write 4
-#define TARGET_NR_open  5
-#define TARGET_NR_close 6
-#define TARGET_NR_waitpid   7
-#define TARGET_NR_creat 8
-#define TARGET_NR_link  9
-#define TARGET_NR_unlink10
-#define TARGET_NR_execve11
-#define TARGET_NR_chdir 12
-#define TARGET_NR_time  13
-#define TARGET_NR_mknod 14
-#define TARGET_NR_chmod 15
-#define TARGET_NR_lchown16
-#define TARGET_NR_break 17
-/* 18 */