[Qemu-devel] [PATCH 00/15] Clean some includes and definitions

[Qemu-devel] [PATCH 00/15] Clean some includes and definitions

[Stefan Weil]

Hi,

I tried to move the definition of HOST_LONG_BITS from configure
to qemu-common.h. While doing this, I noticed that the different
QEMU targets use includes in non-uniform ways.

So the simple goal resulted in quite a lot of patches.

Patch 1 simply removes a derived macro. This patch is independent of
the others.

The next patches try to implement a more uniform include scheme
for the TCG targets than today:

* cpu.h always starts with config.h and qemu-common.h.

* config.h is not needed before cpu.h

* qemu-common.h is not needed after cpu.h.

* Standard includes are not needed because they are already in qemu-common.h

This also avoids potential errors when qemu-common.h is included without
a preceding config.h. Future code changes should be easier as soon as all
targets use a uniform include scheme.

The last patch finally achieves my initial goal.

Regards,

Stefan Weil


[PATCH 01/15] Remove macro HOST_LONG_SIZE
[PATCH 02/15] target-alpha: Clean includes
[PATCH 03/15] target-arm: Clean includes
[PATCH 04/15] target-cris: Clean includes
[PATCH 05/15] target-i386: Clean includes
[PATCH 06/15] target-lm32: Clean includes
[PATCH 07/15] target-m68k: Clean includes
[PATCH 08/15] target-microblaze: Clean includes
[PATCH 09/15] target-mips: Clean includes
[PATCH 10/15] target-ppc: Clean includes
[PATCH 11/15] target-s390x: Clean includes
[PATCH 12/15] target-sh4: Clean includes
[PATCH 13/15] target-unicore32: Clean includes
[PATCH 14/15] target-xtensa: Clean includes
[PATCH 15/15] Move definition of HOST_LONG_BITS to qemu-common.h

[Qemu-devel] [PATCH 01/15] Remove macro HOST_LONG_SIZE

[Stefan Weil]

HOST_LONG_SIZE is simply the size of a pointer value.
There is no need for this macro.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 cpu-defs.h |    2 --
 thunk.h    |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/cpu-defs.h b/cpu-defs.h
index 57a709b..4527cbf 100644
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -60,8 +60,6 @@ typedef uint64_t target_ulong __attribute__((aligned(TARGET_LONG_ALIGNMENT)));
 #error TARGET_LONG_SIZE undefined
 #endif
 
-#define HOST_LONG_SIZE (HOST_LONG_BITS / 8)
-
 #define EXCP_INTERRUPT 	0x10000 /* async interruption */
 #define EXCP_HLT        0x10001 /* hlt instruction reached */
 #define EXCP_DEBUG      0x10002 /* cpu stopped after a breakpoint or singlestep */
diff --git a/thunk.h b/thunk.h
index 109c541..9810743 100644
--- a/thunk.h
+++ b/thunk.h
@@ -99,7 +99,7 @@ static inline int thunk_type_size(const argtype *type_ptr, int is_host)
     case TYPE_PTRVOID:
     case TYPE_PTR:
         if (is_host) {
-            return HOST_LONG_SIZE;
+            return sizeof(void *);
         } else {
             return TARGET_ABI_BITS / 8;
         }
@@ -136,7 +136,7 @@ static inline int thunk_type_align(const argtype *type_ptr, int is_host)
     case TYPE_PTRVOID:
     case TYPE_PTR:
         if (is_host) {
-            return HOST_LONG_SIZE;
+            return sizeof(void *);
         } else {
             return TARGET_ABI_BITS / 8;
         }
-- 
1.7.7.3

[Qemu-devel] [PATCH 02/15] target-alpha: Clean includes

[Stefan Weil]

The change in cpu.h is needed when HOST_LONG_BITS is defined in qemu-common.h.

Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 target-alpha/cpu.h       |    1 +
 target-alpha/translate.c |    5 -----
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h
index 9d61d45..5cd6fd8 100644
--- a/target-alpha/cpu.h
+++ b/target-alpha/cpu.h
@@ -21,6 +21,7 @@
 #define __CPU_ALPHA_H__
 
 #include "config.h"
+#include "qemu-common.h"
 
 #define TARGET_LONG_BITS 64
 
diff --git a/target-alpha/translate.c b/target-alpha/translate.c
index a961159..1d2142b 100644
--- a/target-alpha/translate.c
+++ b/target-alpha/translate.c
@@ -17,15 +17,10 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-
 #include "cpu.h"
 #include "disas.h"
 #include "host-utils.h"
 #include "tcg-op.h"
-#include "qemu-common.h"
 
 #include "helper.h"
 #define GEN_HELPER 1
-- 
1.7.7.3

[Qemu-devel] [PATCH 03/15] target-arm: Clean includes

[Stefan Weil]

Remove some include statements which are not needed.

Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 target-arm/helper.c |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/target-arm/helper.c b/target-arm/helper.c
index ea4f35f..e9e2a27 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -1,11 +1,6 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "cpu.h"
 #include "gdbstub.h"
 #include "helper.h"
-#include "qemu-common.h"
 #include "host-utils.h"
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/loader.h"
-- 
1.7.7.3

Re: [Qemu-devel] [PATCH 03/15] target-arm: Clean includes

[Peter Maydell]

On 2 February 2012 21:12, Stefan Weil <sw@weilnetz.de> wrote:
> Remove some include statements which are not needed.
>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  target-arm/helper.c |    5 -----
>  1 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/target-arm/helper.c b/target-arm/helper.c
> index ea4f35f..e9e2a27 100644
> --- a/target-arm/helper.c
> +++ b/target-arm/helper.c
> @@ -1,11 +1,6 @@
> -#include <stdio.h>
> -#include <stdlib.h>
> -#include <string.h>
> -
>  #include "cpu.h"
>  #include "gdbstub.h"
>  #include "helper.h"
> -#include "qemu-common.h"
>  #include "host-utils.h"
>  #if !defined(CONFIG_USER_ONLY)
>  #include "hw/loader.h"

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

-- PMM

[Qemu-devel] [PATCH 04/15] target-cris: Clean includes

[Stefan Weil]

The change in cpu.h is needed when HOST_LONG_BITS is defined in qemu-common.h.

Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 target-cris/cpu.h       |    3 +++
 target-cris/helper.c    |    4 ----
 target-cris/mmu.c       |    5 -----
 target-cris/translate.c |    7 -------
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/target-cris/cpu.h b/target-cris/cpu.h
index 453afbb..222a062 100644
--- a/target-cris/cpu.h
+++ b/target-cris/cpu.h
@@ -20,6 +20,9 @@
 #ifndef CPU_CRIS_H
 #define CPU_CRIS_H
 
+#include "config.h"
+#include "qemu-common.h"
+
 #define TARGET_LONG_BITS 32
 
 #define CPUState struct CPUCRISState
diff --git a/target-cris/helper.c b/target-cris/helper.c
index 5bc6d81..dd7f18e 100644
--- a/target-cris/helper.c
+++ b/target-cris/helper.c
@@ -18,10 +18,6 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <string.h>
-
-#include "config.h"
 #include "cpu.h"
 #include "mmu.h"
 #include "host-utils.h"
diff --git a/target-cris/mmu.c b/target-cris/mmu.c
index d481e39..5cd8f27 100644
--- a/target-cris/mmu.c
+++ b/target-cris/mmu.c
@@ -20,11 +20,6 @@
 
 #ifndef CONFIG_USER_ONLY
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "config.h"
 #include "cpu.h"
 #include "mmu.h"
 
diff --git a/target-cris/translate.c b/target-cris/translate.c
index 70abf8a..cbdc72c 100644
--- a/target-cris/translate.c
+++ b/target-cris/translate.c
@@ -23,19 +23,12 @@
  * The condition code translation is in need of attention.
  */
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
-
 #include "cpu.h"
 #include "disas.h"
 #include "tcg-op.h"
 #include "helper.h"
 #include "mmu.h"
 #include "crisv32-decode.h"
-#include "qemu-common.h"
 
 #define GEN_HELPER 1
 #include "helper.h"
-- 
1.7.7.3

[Qemu-devel] [PATCH 05/15] target-i386: Clean includes

[Stefan Weil]

Remove some include statements which are not needed.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 target-i386/helper.c    |    6 ------
 target-i386/op_helper.c |    1 -
 2 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/target-i386/helper.c b/target-i386/helper.c
index 2586aff..87c6a8f 100644
--- a/target-i386/helper.c
+++ b/target-i386/helper.c
@@ -16,14 +16,8 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
 
 #include "cpu.h"
-#include "qemu-common.h"
 #include "kvm.h"
 #ifndef CONFIG_USER_ONLY
 #include "sysemu.h"
diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c
index 1005b01..51a3b52 100644
--- a/target-i386/op_helper.c
+++ b/target-i386/op_helper.c
@@ -22,7 +22,6 @@
 #include "dyngen-exec.h"
 #include "host-utils.h"
 #include "ioport.h"
-#include "qemu-common.h"
 #include "qemu-log.h"
 #include "cpu-defs.h"
 #include "helper.h"
-- 
1.7.7.3

[Qemu-devel] [PATCH 06/15] target-lm32: Clean includes

[Stefan Weil]

config.h was missing in cpu.h.

Cc: Michael Walle <michael@walle.cc>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 target-lm32/cpu.h       |    1 +
 target-lm32/helper.c    |    5 -----
 target-lm32/translate.c |    8 --------
 3 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/target-lm32/cpu.h b/target-lm32/cpu.h
index 037ef52..b6b6b4c 100644
--- a/target-lm32/cpu.h
+++ b/target-lm32/cpu.h
@@ -24,6 +24,7 @@
 
 #define CPUState struct CPULM32State
 
+#include "config.h"
 #include "qemu-common.h"
 #include "cpu-defs.h"
 struct CPULM32State;
diff --git a/target-lm32/helper.c b/target-lm32/helper.c
index fc0b444..2637c03 100644
--- a/target-lm32/helper.c
+++ b/target-lm32/helper.c
@@ -17,11 +17,6 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include "config.h"
 #include "cpu.h"
 #include "host-utils.h"
 
diff --git a/target-lm32/translate.c b/target-lm32/translate.c
index 0be105d..c80e48b 100644
--- a/target-lm32/translate.c
+++ b/target-lm32/translate.c
@@ -17,18 +17,10 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
-#include <assert.h>
-
 #include "cpu.h"
 #include "disas.h"
 #include "helper.h"
 #include "tcg-op.h"
-#include "qemu-common.h"
 
 #include "hw/lm32_pic.h"
 
-- 
1.7.7.3

Re: [Qemu-devel] [PATCH 06/15] target-lm32: Clean includes

[Michael Walle]

Am Donnerstag 02 Februar 2012, 22:12:48 schrieb Stefan Weil:
> config.h was missing in cpu.h.
> 
> Cc: Michael Walle <michael@walle.cc>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>  target-lm32/cpu.h       |    1 +
>  target-lm32/helper.c    |    5 -----
>  target-lm32/translate.c |    8 --------
>  3 files changed, 1 insertions(+), 13 deletions(-)
> 
> diff --git a/target-lm32/cpu.h b/target-lm32/cpu.h
> index 037ef52..b6b6b4c 100644
> --- a/target-lm32/cpu.h
> +++ b/target-lm32/cpu.h
> @@ -24,6 +24,7 @@
> 
>  #define CPUState struct CPULM32State
> 
> +#include "config.h"
>  #include "qemu-common.h"
>  #include "cpu-defs.h"
>  struct CPULM32State;
> diff --git a/target-lm32/helper.c b/target-lm32/helper.c
> index fc0b444..2637c03 100644
> --- a/target-lm32/helper.c
> +++ b/target-lm32/helper.c
> @@ -17,11 +17,6 @@
>   * License along with this library; if not, see
> <http://www.gnu.org/licenses/>. */
> 
> -#include <stdio.h>
> -#include <string.h>
> -#include <assert.h>
> -
> -#include "config.h"
>  #include "cpu.h"
>  #include "host-utils.h"
> 
> diff --git a/target-lm32/translate.c b/target-lm32/translate.c
> index 0be105d..c80e48b 100644
> --- a/target-lm32/translate.c
> +++ b/target-lm32/translate.c
> @@ -17,18 +17,10 @@
>   * License along with this library; if not, see
> <http://www.gnu.org/licenses/>. */
> 
> -#include <stdarg.h>
> -#include <stdlib.h>
> -#include <stdio.h>
> -#include <string.h>
> -#include <inttypes.h>
> -#include <assert.h>
> -
>  #include "cpu.h"
>  #include "disas.h"
>  #include "helper.h"
>  #include "tcg-op.h"
> -#include "qemu-common.h"
> 
>  #include "hw/lm32_pic.h"

Acked-by: Michael Walle <michael@walle.cc>

-- 
michael

[Qemu-devel] [PATCH 07/15] target-m68k: Clean includes

[Stefan Weil]

config.h was missing in cpu.h.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 target-m68k/cpu.h       |    1 +
 target-m68k/helper.c    |    5 -----
 target-m68k/translate.c |    6 ------
 3 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h
index 0667f82..4cc3a35 100644
--- a/target-m68k/cpu.h
+++ b/target-m68k/cpu.h
@@ -24,6 +24,7 @@
 
 #define CPUState struct CPUM68KState
 
+#include "config.h"
 #include "qemu-common.h"
 #include "cpu-defs.h"
 
diff --git a/target-m68k/helper.c b/target-m68k/helper.c
index 674c8e6..fa675bf 100644
--- a/target-m68k/helper.c
+++ b/target-m68k/helper.c
@@ -18,12 +18,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <string.h>
-
-#include "config.h"
 #include "cpu.h"
-#include "qemu-common.h"
 #include "gdbstub.h"
 
 #include "helpers.h"
diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index 0e7f1fe..2bdd9dd 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -17,13 +17,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
 
-#include "config.h"
 #include "cpu.h"
 #include "disas.h"
 #include "tcg-op.h"
-- 
1.7.7.3

[Qemu-devel] [PATCH 08/15] target-microblaze: Clean includes

[Stefan Weil]

The change in cpu.h is needed when HOST_LONG_BITS is defined in qemu-common.h.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 target-microblaze/cpu.h       |    3 +++
 target-microblaze/helper.c    |    5 -----
 target-microblaze/mmu.c       |    4 ----
 target-microblaze/translate.c |    8 --------
 4 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/target-microblaze/cpu.h b/target-microblaze/cpu.h
index 3ecaeee..4092506 100644
--- a/target-microblaze/cpu.h
+++ b/target-microblaze/cpu.h
@@ -19,6 +19,9 @@
 #ifndef CPU_MICROBLAZE_H
 #define CPU_MICROBLAZE_H
 
+#include "config.h"
+#include "qemu-common.h"
+
 #define TARGET_LONG_BITS 32
 
 #define CPUState struct CPUMBState
diff --git a/target-microblaze/helper.c b/target-microblaze/helper.c
index 2cf2802..e1355ff 100644
--- a/target-microblaze/helper.c
+++ b/target-microblaze/helper.c
@@ -17,11 +17,6 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include "config.h"
 #include "cpu.h"
 #include "host-utils.h"
 
diff --git a/target-microblaze/mmu.c b/target-microblaze/mmu.c
index 281fc8d..7c34ac0 100644
--- a/target-microblaze/mmu.c
+++ b/target-microblaze/mmu.c
@@ -16,11 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
 
-#include "config.h"
 #include "cpu.h"
 
 #define D(x)
diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c
index 96ce2ec..725c2dd 100644
--- a/target-microblaze/translate.c
+++ b/target-microblaze/translate.c
@@ -17,19 +17,11 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
-#include <assert.h>
-
 #include "cpu.h"
 #include "disas.h"
 #include "tcg-op.h"
 #include "helper.h"
 #include "microblaze-decode.h"
-#include "qemu-common.h"
 
 #define GEN_HELPER 1
 #include "helper.h"
-- 
1.7.7.3

[Qemu-devel] [PATCH 09/15] target-mips: Clean includes

[Stefan Weil]

Remove some include statements which are not needed.

Cc: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 target-mips/translate.c |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/target-mips/translate.c b/target-mips/translate.c
index d5b1c76..8361d88 100644
--- a/target-mips/translate.c
+++ b/target-mips/translate.c
@@ -20,16 +20,9 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
-
 #include "cpu.h"
 #include "disas.h"
 #include "tcg-op.h"
-#include "qemu-common.h"
 
 #include "helper.h"
 #define GEN_HELPER 1
-- 
1.7.7.3

[Qemu-devel] [PATCH 10/15] target-ppc: Clean includes

[Stefan Weil]

Remove some include statements which are not needed.

Cc: Alexander Graf <agraf@suse.de>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 target-ppc/helper.c    |    6 ------
 target-ppc/translate.c |    6 ------
 2 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/target-ppc/helper.c b/target-ppc/helper.c
index 5847453..455dcc0 100644
--- a/target-ppc/helper.c
+++ b/target-ppc/helper.c
@@ -16,15 +16,9 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
 
 #include "cpu.h"
 #include "helper_regs.h"
-#include "qemu-common.h"
 #include "kvm.h"
 #include "kvm_ppc.h"
 #include "cpus.h"
diff --git a/target-ppc/translate.c b/target-ppc/translate.c
index 66eae30..74ad855 100644
--- a/target-ppc/translate.c
+++ b/target-ppc/translate.c
@@ -17,16 +17,10 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
 
 #include "cpu.h"
 #include "disas.h"
 #include "tcg-op.h"
-#include "qemu-common.h"
 #include "host-utils.h"
 
 #include "helper.h"
-- 
1.7.7.3

Re: [Qemu-devel] [PATCH 10/15] target-ppc: Clean includes

[Alexander Graf]

On 02.02.2012, at 22:12, Stefan Weil wrote:

> Remove some include statements which are not needed.

Are these redundant or do they just happen to be unnecessary because of unused debug #ifdefs?


Alex

> 
> Cc: Alexander Graf <agraf@suse.de>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
> target-ppc/helper.c    |    6 ------
> target-ppc/translate.c |    6 ------
> 2 files changed, 0 insertions(+), 12 deletions(-)
> 
> diff --git a/target-ppc/helper.c b/target-ppc/helper.c
> index 5847453..455dcc0 100644
> --- a/target-ppc/helper.c
> +++ b/target-ppc/helper.c
> @@ -16,15 +16,9 @@
>  * You should have received a copy of the GNU Lesser General Public
>  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
>  */
> -#include <stdarg.h>
> -#include <stdlib.h>
> -#include <stdio.h>
> -#include <string.h>
> -#include <inttypes.h>
> 
> #include "cpu.h"
> #include "helper_regs.h"
> -#include "qemu-common.h"
> #include "kvm.h"
> #include "kvm_ppc.h"
> #include "cpus.h"
> diff --git a/target-ppc/translate.c b/target-ppc/translate.c
> index 66eae30..74ad855 100644
> --- a/target-ppc/translate.c
> +++ b/target-ppc/translate.c
> @@ -17,16 +17,10 @@
>  * You should have received a copy of the GNU Lesser General Public
>  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
>  */
> -#include <stdarg.h>
> -#include <stdlib.h>
> -#include <stdio.h>
> -#include <string.h>
> -#include <inttypes.h>
> 
> #include "cpu.h"
> #include "disas.h"
> #include "tcg-op.h"
> -#include "qemu-common.h"
> #include "host-utils.h"
> 
> #include "helper.h"
> -- 
> 1.7.7.3
> 

Re: [Qemu-devel] [PATCH 10/15] target-ppc: Clean includes

[Stefan Weil]

Am 02.02.2012 22:26, schrieb Alexander Graf:
>
> On 02.02.2012, at 22:12, Stefan Weil wrote:
>
>> Remove some include statements which are not needed.
>
> Are these redundant or do they just happen to be unnecessary because 
> of unused debug #ifdefs?
>
>
> Alex

They are redundant because cpu.h includes qemu-common.h which includes
the standard include files.

Cheers,
Stefan

Re: [Qemu-devel] [PATCH 10/15] target-ppc: Clean includes

[Alexander Graf]

On 02.02.2012, at 23:46, Stefan Weil wrote:

> Am 02.02.2012 22:26, schrieb Alexander Graf:
>> 
>> On 02.02.2012, at 22:12, Stefan Weil wrote:
>> 
>>> Remove some include statements which are not needed.
>> 
>> Are these redundant or do they just happen to be unnecessary because of unused debug #ifdefs?
>> 
>> 
>> Alex
> 
> They are redundant because cpu.h includes qemu-common.h which includes
> the standard include files.

Well, then:

Acked-by: Alexander Graf <agraf@suse.de>


Alex

[Qemu-devel] [PATCH 11/15] target-s390x: Clean includes

[Stefan Weil]

The change in cpu.h is needed when HOST_LONG_BITS is defined in qemu-common.h.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 target-s390x/cpu.h       |    3 +++
 target-s390x/helper.c    |    5 -----
 target-s390x/translate.c |    5 -----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index b8893b3..e892bec 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -19,6 +19,9 @@
 #ifndef CPU_S390X_H
 #define CPU_S390X_H
 
+#include "config.h"
+#include "qemu-common.h"
+
 #define TARGET_LONG_BITS 64
 
 #define ELF_MACHINE	EM_S390
diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index 10cc9dd..c0ec890 100644
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -18,13 +18,8 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "cpu.h"
 #include "gdbstub.h"
-#include "qemu-common.h"
 #include "qemu-timer.h"
 #ifndef CONFIG_USER_ONLY
 #include "sysemu.h"
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index ee15672..71f9dcd 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -17,11 +17,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
 
 /* #define DEBUG_ILLEGAL_INSTRUCTIONS */
 /* #define DEBUG_INLINE_BRANCHES */
-- 
1.7.7.3

[Qemu-devel] [PATCH 12/15] target-sh4: Clean includes

[Stefan Weil]

Remove some include statements which are not needed.

Cc: Aurelien Jarno <aurelien@aurel32.net>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 target-sh4/translate.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/target-sh4/translate.c b/target-sh4/translate.c
index aacf96d..dd0ee4b 100644
--- a/target-sh4/translate.c
+++ b/target-sh4/translate.c
@@ -16,11 +16,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
 
 #define DEBUG_DISAS
 #define SH4_DEBUG_DISAS
@@ -29,7 +24,6 @@
 #include "cpu.h"
 #include "disas.h"
 #include "tcg-op.h"
-#include "qemu-common.h"
 
 #include "helper.h"
 #define GEN_HELPER 1
-- 
1.7.7.3

[Qemu-devel] [PATCH 13/15] target-unicore32: Clean includes

[Stefan Weil]

The change in cpu.h is needed when HOST_LONG_BITS is defined in qemu-common.h.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 target-unicore32/cpu.h    |    2 ++
 target-unicore32/helper.c |    4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h
index b4e72cf..f725634 100644
--- a/target-unicore32/cpu.h
+++ b/target-unicore32/cpu.h
@@ -20,6 +20,8 @@
 
 #define CPUState                struct CPUState_UniCore32
 
+#include "config.h"
+#include "qemu-common.h"
 #include "cpu-defs.h"
 #include "softfloat.h"
 
diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
index b5b1cb7..ee7f82b 100644
--- a/target-unicore32/helper.c
+++ b/target-unicore32/helper.c
@@ -5,14 +5,10 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 #include "cpu.h"
 #include "gdbstub.h"
 #include "helper.h"
-#include "qemu-common.h"
 #include "host-utils.h"
 
 static inline void set_feature(CPUState *env, int feature)
-- 
1.7.7.3

[Qemu-devel] [PATCH 14/15] target-xtensa: Clean includes

[Stefan Weil]

Remove some include statements which are not needed.

Cc: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 target-xtensa/core-dc232b.c |    1 -
 target-xtensa/core-fsf.c    |    1 -
 target-xtensa/helper.c      |    1 -
 3 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/target-xtensa/core-dc232b.c b/target-xtensa/core-dc232b.c
index 4d9bd55..21b287d 100644
--- a/target-xtensa/core-dc232b.c
+++ b/target-xtensa/core-dc232b.c
@@ -1,7 +1,6 @@
 #include "cpu.h"
 #include "exec-all.h"
 #include "gdbstub.h"
-#include "qemu-common.h"
 #include "host-utils.h"
 
 #include "core-dc232b/core-isa.h"
diff --git a/target-xtensa/core-fsf.c b/target-xtensa/core-fsf.c
index 7650462..763b8e5 100644
--- a/target-xtensa/core-fsf.c
+++ b/target-xtensa/core-fsf.c
@@ -1,7 +1,6 @@
 #include "cpu.h"
 #include "exec-all.h"
 #include "gdbstub.h"
-#include "qemu-common.h"
 #include "host-utils.h"
 
 #include "core-fsf/core-isa.h"
diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c
index 2a0cb1a..1264c83 100644
--- a/target-xtensa/helper.c
+++ b/target-xtensa/helper.c
@@ -28,7 +28,6 @@
 #include "cpu.h"
 #include "exec-all.h"
 #include "gdbstub.h"
-#include "qemu-common.h"
 #include "host-utils.h"
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/loader.h"
-- 
1.7.7.3

Re: [Qemu-devel] [PATCH 14/15] target-xtensa: Clean includes

[Max Filippov]

> Remove some include statements which are not needed.
> 
> Cc: Max Filippov <jcmvbkbc@gmail.com>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>

Acked-by: Max Filippov <jcmvbkbc@gmail.com>

Thanks.
-- Max

[Qemu-devel] [PATCH 15/15] Move definition of HOST_LONG_BITS to qemu-common.h

[Stefan Weil]

Like the related macro TCG_TARGET_LONG, HOST_LONG_BITS can be determined
by the C preprocessor. It is also not used in Makefiles.

So there is no need to calculate it in configure, and it can be defined
in qemu-common.h.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 configure     |   12 ------------
 qemu-common.h |    9 +++++++++
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index 3b0b300..6dec57d 100755
--- a/configure
+++ b/configure
@@ -1266,17 +1266,6 @@ esac
 
 fi
 
-# host long bits test, actually a pointer size test
-cat > $TMPC << EOF
-int sizeof_pointer_is_8[sizeof(void *) == 8 ? 1 : -1];
-EOF
-if compile_object; then
-hostlongbits=64
-else
-hostlongbits=32
-fi
-
-
 ##########################################
 # NPTL probe
 
@@ -2927,7 +2916,6 @@ fi
 if test "$bigendian" = "yes" ; then
   echo "HOST_WORDS_BIGENDIAN=y" >> $config_host_mak
 fi
-echo "HOST_LONG_BITS=$hostlongbits" >> $config_host_mak
 if test "$mingw32" = "yes" ; then
   echo "CONFIG_WIN32=y" >> $config_host_mak
   rc_version=`cat $source_path/VERSION`
diff --git a/qemu-common.h b/qemu-common.h
index 8b69a9e..bd0b1bd 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -65,6 +65,15 @@ typedef struct Monitor Monitor;
 #define TIME_MAX LONG_MAX
 #endif
 
+/* HOST_LONG_BITS is the size of a native pointer in bits. */
+#if UINTPTR_MAX == UINT32_MAX
+# define HOST_LONG_BITS 32
+#elif UINTPTR_MAX == UINT64_MAX
+# define HOST_LONG_BITS 64
+#else
+# error Unknown pointer size
+#endif
+
 #ifndef CONFIG_IOVEC
 #define CONFIG_IOVEC
 struct iovec {
-- 
1.7.7.3

[Qemu-devel] [PULL] Patch queue

[Stefan Weil]

Hi,

please pull these patches from January.

Thanks,

Stefan Weil


The following changes since commit b55c952aea6de024bf1a06357b49367fba045443:

  Merge remote-tracking branch 'aneesh/for-upstream' into staging (2012-02-27 11:19:27 -0600)

are available in the git repository at:


  git://qemu.weilnetz.de/qemu.git upstream

for you to fetch changes up to c0fd260e9da7e6e60ea6bf1b0198a804f147073f:

  Move definition of HOST_LONG_BITS to qemu-common.h (2012-02-28 22:33:43 +0100)

----------------------------------------------------------------
Stefan Weil (15):
      Remove macro HOST_LONG_SIZE
      target-alpha: Clean includes
      target-arm: Clean includes
      target-cris: Clean includes
      target-i386: Clean includes
      target-lm32: Clean includes
      target-m68k: Clean includes
      target-microblaze: Clean includes
      target-mips: Clean includes
      target-ppc: Clean includes
      target-s390x: Clean includes
      target-sh4: Clean includes
      target-unicore32: Clean includes
      target-xtensa: Clean includes
      Move definition of HOST_LONG_BITS to qemu-common.h

 configure                     |   12 ------------
 cpu-defs.h                    |    2 --
 qemu-common.h                 |    9 +++++++++
 target-alpha/cpu.h            |    1 +
 target-alpha/translate.c      |    5 -----
 target-arm/helper.c           |    5 -----
 target-cris/cpu.h             |    3 +++
 target-cris/helper.c          |    4 ----
 target-cris/mmu.c             |    5 -----
 target-cris/translate.c       |    7 -------
 target-i386/helper.c          |    6 ------
 target-i386/op_helper.c       |    1 -
 target-lm32/cpu.h             |    1 +
 target-lm32/helper.c          |    5 -----
 target-lm32/translate.c       |    8 --------
 target-m68k/cpu.h             |    1 +
 target-m68k/helper.c          |    5 -----
 target-m68k/translate.c       |    6 ------
 target-microblaze/cpu.h       |    3 +++
 target-microblaze/helper.c    |    5 -----
 target-microblaze/mmu.c       |    4 ----
 target-microblaze/translate.c |    8 --------
 target-mips/translate.c       |    7 -------
 target-ppc/helper.c           |    6 ------
 target-ppc/translate.c        |    6 ------
 target-s390x/cpu.h            |    3 +++
 target-s390x/helper.c         |    5 -----
 target-s390x/translate.c      |    5 -----
 target-sh4/translate.c        |    6 ------
 target-unicore32/cpu.h        |    2 ++
 target-unicore32/helper.c     |    4 ----
 target-xtensa/core-dc232b.c   |    1 -
 target-xtensa/core-fsf.c      |    1 -
 target-xtensa/helper.c        |    1 -
 thunk.h                       |    4 ++--
 35 files changed, 25 insertions(+), 132 deletions(-)

[Qemu-devel] [PATCH 06/15] target-lm32: Clean includes

[Stefan Weil]

config.h was missing in cpu.h.

Acked-by: Michael Walle <michael@walle.cc>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 target-lm32/cpu.h       |    1 +
 target-lm32/helper.c    |    5 -----
 target-lm32/translate.c |    8 --------
 3 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/target-lm32/cpu.h b/target-lm32/cpu.h
index 037ef52..b6b6b4c 100644
--- a/target-lm32/cpu.h
+++ b/target-lm32/cpu.h
@@ -24,6 +24,7 @@
 
 #define CPUState struct CPULM32State
 
+#include "config.h"
 #include "qemu-common.h"
 #include "cpu-defs.h"
 struct CPULM32State;
diff --git a/target-lm32/helper.c b/target-lm32/helper.c
index fc0b444..2637c03 100644
--- a/target-lm32/helper.c
+++ b/target-lm32/helper.c
@@ -17,11 +17,6 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include "config.h"
 #include "cpu.h"
 #include "host-utils.h"
 
diff --git a/target-lm32/translate.c b/target-lm32/translate.c
index 0be105d..c80e48b 100644
--- a/target-lm32/translate.c
+++ b/target-lm32/translate.c
@@ -17,18 +17,10 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
-#include <assert.h>
-
 #include "cpu.h"
 #include "disas.h"
 #include "helper.h"
 #include "tcg-op.h"
-#include "qemu-common.h"
 
 #include "hw/lm32_pic.h"
 
-- 
1.7.9