[Qemu-devel] [PULL 0/3] Prepare removal of SoftFloat integer types

[Qemu-devel] [PULL 0/3] Prepare removal of SoftFloat integer types

[Andreas Färber]

Hello,

The following patches are split off from the softfloat series
and updated as requested.


The following changes since commit 4fd37a98d1248bae54a9f71ee1c252d2b2f1efd5:

  Avoid a warning from OpenBSD linker (2010-12-19 14:05:43 +0000)

are available in the git repository at:
  git://repo.or.cz/qemu/afaerber.git softfloat-for-blue

Andreas Färber (3):
      apic: Fix accidental use of SoftFloat uint32 type
      wdt_ib700: Fix accidental use of SoftFloat int64 type
      target-i386: Fix accidental use of SoftFloat uint64 type

 hw/apic.c         |    2 +-
 hw/wdt_ib700.c    |    2 +-
 target-i386/cpu.h |    8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

-- 
1.7.3.4

[Qemu-devel] [PATCH v4 1/3] apic: Fix accidental use of SoftFloat uint32 type

[Andreas Färber]

softfloat.h's uint32 type has least-width semantics.
Surrounding code uses uint32_t, so use uint32_t here, too.

v4:
* Summary change.

v3:
* Split off.

Signed-off-by: Andreas Färber <andreas.faerber@web.de>
---
 hw/apic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/apic.c b/hw/apic.c
index a5a53fb..ff581f0 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -765,7 +765,7 @@ static uint32_t apic_mem_readl(void *opaque, target_phys_addr_t addr)
     return val;
 }
 
-static void apic_send_msi(target_phys_addr_t addr, uint32 data)
+static void apic_send_msi(target_phys_addr_t addr, uint32_t data)
 {
     uint8_t dest = (addr & MSI_ADDR_DEST_ID_MASK) >> MSI_ADDR_DEST_ID_SHIFT;
     uint8_t vector = (data & MSI_DATA_VECTOR_MASK) >> MSI_DATA_VECTOR_SHIFT;
-- 
1.7.3.4

[Qemu-devel] [PATCH v4 2/3] wdt_ib700: Fix accidental use of SoftFloat int64 type

[Andreas Färber]

softfloat.h's int64 type has least-width semantics.
Since we're assigning an int64_t, use plain int64_t.

v4:
* Summary change.

v3:
* Split off.

Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Acked-by: Richard W.M. Jones <rjones@redhat.com>
---
 hw/wdt_ib700.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/wdt_ib700.c b/hw/wdt_ib700.c
index b6235eb..1248464 100644
--- a/hw/wdt_ib700.c
+++ b/hw/wdt_ib700.c
@@ -53,7 +53,7 @@ static void ib700_write_enable_reg(void *vp, uint32_t addr, uint32_t data)
         30, 28, 26, 24, 22, 20, 18, 16,
         14, 12, 10,  8,  6,  4,  2,  0
     };
-    int64 timeout;
+    int64_t timeout;
 
     ib700_debug("addr = %x, data = %x\n", addr, data);
 
-- 
1.7.3.4

[Qemu-devel] [PATCH v4 3/3] target-i386: Fix accidental use of SoftFloat uint64 type

[Andreas Färber]

softfloat.h's uint64 type has least-width semantics.
Use uint64_t instead since that is used in helpers.

v4:
* Summary change.

v3:
* Split off.

Cc: Huang Ying <ying.huang@intel.com>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Acked-by: Juan Quintela <quintela@redhat.com>
---
 target-i386/cpu.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index 06e40f3..f0c07cd 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -737,10 +737,10 @@ typedef struct CPUX86State {
        user */
     struct DeviceState *apic_state;
 
-    uint64 mcg_cap;
-    uint64 mcg_status;
-    uint64 mcg_ctl;
-    uint64 mce_banks[MCE_BANKS_DEF*4];
+    uint64_t mcg_cap;
+    uint64_t mcg_status;
+    uint64_t mcg_ctl;
+    uint64_t mce_banks[MCE_BANKS_DEF*4];
 
     uint64_t tsc_aux;
 
-- 
1.7.3.4

Re: [Qemu-devel] [PATCH v4 3/3] target-i386: Fix accidental use of SoftFloat uint64 type

[Andreas Färber]

Am 19.12.2010 um 17:22 schrieb Andreas Färber:

> softfloat.h's uint64 type has least-width semantics.
> Use uint64_t instead since that is used in helpers.
>
> v4:
> * Summary change.
>
> v3:
> * Split off.
>
> Cc: Huang Ying <ying.huang@intel.com>
> Signed-off-by: Andreas Färber <andreas.faerber@web.de>
> Acked-by: Juan Quintela <quintela@redhat.com>

Updated on branch with Cc -> Acked-by.

> ---
> target-i386/cpu.h |    8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/target-i386/cpu.h b/target-i386/cpu.h
> index 06e40f3..f0c07cd 100644
> --- a/target-i386/cpu.h
> +++ b/target-i386/cpu.h
> @@ -737,10 +737,10 @@ typedef struct CPUX86State {
>       user */
>    struct DeviceState *apic_state;
>
> -    uint64 mcg_cap;
> -    uint64 mcg_status;
> -    uint64 mcg_ctl;
> -    uint64 mce_banks[MCE_BANKS_DEF*4];
> +    uint64_t mcg_cap;
> +    uint64_t mcg_status;
> +    uint64_t mcg_ctl;
> +    uint64_t mce_banks[MCE_BANKS_DEF*4];
>
>    uint64_t tsc_aux;
>
> -- 
> 1.7.3.4
>
>

[Qemu-devel] Re: [PULL 0/3] Prepare removal of SoftFloat integer types

[Blue Swirl]

Thanks, applied all.

On Sun, Dec 19, 2010 at 4:22 PM, Andreas Färber <andreas.faerber@web.de> wrote:
> Hello,
>
> The following patches are split off from the softfloat series
> and updated as requested.
>
>
> The following changes since commit 4fd37a98d1248bae54a9f71ee1c252d2b2f1efd5:
>
>  Avoid a warning from OpenBSD linker (2010-12-19 14:05:43 +0000)
>
> are available in the git repository at:
>  git://repo.or.cz/qemu/afaerber.git softfloat-for-blue
>
> Andreas Färber (3):
>      apic: Fix accidental use of SoftFloat uint32 type
>      wdt_ib700: Fix accidental use of SoftFloat int64 type
>      target-i386: Fix accidental use of SoftFloat uint64 type
>
>  hw/apic.c         |    2 +-
>  hw/wdt_ib700.c    |    2 +-
>  target-i386/cpu.h |    8 ++++----
>  3 files changed, 6 insertions(+), 6 deletions(-)
>
> --
> 1.7.3.4
>
>