Skip to contentSkip to conversation

Prepare removal of SoftFloat integer types

GIT PULL In review Andreas Färber 2 participants 6 messages Dec 19, 2010 – Dec 20, 2010

lore
Share & tools
lore
#0 lore raw

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(-)
Signature · 1 line
1.7.3.4
#1 lore raw

PATCH v4 1/3 apic: Fix accidental use of SoftFloat uint32 type

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.

---
 hw/apic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
hw/apic.c +1 -1
index a5a53fb..ff581f0 100644
@@ -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;
Signature · 1 line
1.7.3.4
#2 lore raw

PATCH v4 2/3 wdt_ib700: Fix accidental use of SoftFloat int64 type

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.

---
 hw/wdt_ib700.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
hw/wdt_ib700.c +1 -1
index b6235eb..1248464 100644
@@ -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);
 
Signature · 1 line
1.7.3.4
#3 lore raw

PATCH v4 3/3 target-i386: Fix accidental use of SoftFloat uint64 type

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.

---
 target-i386/cpu.h |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
target-i386/cpu.h +4 -4
index 06e40f3..f0c07cd 100644
@@ -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;
 
Signature · 1 line
1.7.3.4
#4 lore raw

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

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

Quoted 6 lines

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

v4:
* Summary change.

Quoted 6 lines

v3:
* Split off.

Updated on branch with Cc -> Acked-by.

Quoted 27 lines

---
target-i386/cpu.h | 8 ++++----

1 files changed, 4 insertions(+), 4 deletions(-)
target-i386/cpu.h +4 -4
index 06e40f3..f0c07cd 100644
@@ -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;
 
Signature · 1 line
1.7.3.4
Applied
#5 lore raw
In reply to Andreas Färber

Thanks, applied all.

Quoted 27 lines · 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