tcg/mips: use stack for TCG temps

[qemu.git] / hw / mipsnet.c

diff --git a/hw/mipsnet.c b/hw/mipsnet.c
index a95b3ce07b65f6097496b53dc90569cfd851c79c..28063b1106ae5c964342d10f9ca953a5f294ed96 100644 (file)
--- a/hw/mipsnet.c
+++ b/hw/mipsnet.c
@@ -1,12 +1,7 @@
 #include "hw.h"
 #include "hw.h"

-#include "mips.h"

 #include "net.h"
 #include "net.h"

-#include "isa.h"
-
-//#define DEBUG_MIPSNET_SEND
-//#define DEBUG_MIPSNET_RECEIVE
-//#define DEBUG_MIPSNET_DATA
-//#define DEBUG_MIPSNET_IRQ
+#include "trace.h"
+#include "sysbus.h"

 
 /* MIPSnet register offsets */
 
 
 /* MIPSnet register offsets */
 


@@ -25,6 +20,8 @@
 #define MAX_ETH_FRAME_SIZE     1514
 
 typedef struct MIPSnetState {
 #define MAX_ETH_FRAME_SIZE     1514
 
 typedef struct MIPSnetState {

+    SysBusDevice busdev;
+

     uint32_t busy;
     uint32_t rx_count;
     uint32_t rx_read;
     uint32_t busy;
     uint32_t rx_count;
     uint32_t rx_read;


@@ -33,7 +30,7 @@ typedef struct MIPSnetState {
     uint32_t intctl;
     uint8_t rx_buffer[MAX_ETH_FRAME_SIZE];
     uint8_t tx_buffer[MAX_ETH_FRAME_SIZE];
     uint32_t intctl;
     uint8_t rx_buffer[MAX_ETH_FRAME_SIZE];
     uint8_t tx_buffer[MAX_ETH_FRAME_SIZE];

-    int io_base;
+    MemoryRegion io;

     qemu_irq irq;
     NICState *nic;
     NICConf conf;
     qemu_irq irq;
     NICState *nic;
     NICConf conf;


@@ -54,9 +51,7 @@ static void mipsnet_reset(MIPSnetState *s)
 static void mipsnet_update_irq(MIPSnetState *s)
 {
     int isr = !!s->intctl;
 static void mipsnet_update_irq(MIPSnetState *s)
 {
     int isr = !!s->intctl;

-#ifdef DEBUG_MIPSNET_IRQ
-    printf("mipsnet: Set IRQ to %d (%02x)\n", isr, s->intctl);
-#endif
+    trace_mipsnet_irq(isr, s->intctl);

     qemu_set_irq(s->irq, isr);
 }
 
     qemu_set_irq(s->irq, isr);
 }
 


@@ -67,7 +62,7 @@ static int mipsnet_buffer_full(MIPSnetState *s)
     return 0;
 }
 
     return 0;
 }
 

-static int mipsnet_can_receive(VLANClientState *nc)
+static int mipsnet_can_receive(NetClientState *nc)

 {
     MIPSnetState *s = DO_UPCAST(NICState, nc, nc)->opaque;
 
 {
     MIPSnetState *s = DO_UPCAST(NICState, nc, nc)->opaque;
 


@@ -76,13 +71,11 @@ static int mipsnet_can_receive(VLANClientState *nc)
     return !mipsnet_buffer_full(s);
 }
 
     return !mipsnet_buffer_full(s);
 }
 

-static ssize_t mipsnet_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
+static ssize_t mipsnet_receive(NetClientState *nc, const uint8_t *buf, size_t size)

 {
     MIPSnetState *s = DO_UPCAST(NICState, nc, nc)->opaque;
 
 {
     MIPSnetState *s = DO_UPCAST(NICState, nc, nc)->opaque;
 

-#ifdef DEBUG_MIPSNET_RECEIVE
-    printf("mipsnet: receiving len=%d\n", size);
-#endif
+    trace_mipsnet_receive(size);

     if (!mipsnet_can_receive(nc))
         return -1;
 
     if (!mipsnet_can_receive(nc))
         return -1;
 


@@ -103,7 +96,8 @@ static ssize_t mipsnet_receive(VLANClientState *nc, const uint8_t *buf, size_t s
     return size;
 }
 
     return size;
 }
 

-static uint32_t mipsnet_ioport_read(void *opaque, uint32_t addr)
+static uint64_t mipsnet_ioport_read(void *opaque, target_phys_addr_t addr,
+                                    unsigned int size)

 {
     MIPSnetState *s = opaque;
     int ret = 0;
 {
     MIPSnetState *s = opaque;
     int ret = 0;


@@ -144,20 +138,17 @@ static uint32_t mipsnet_ioport_read(void *opaque, uint32_t addr)
     default:
         break;
     }
     default:
         break;
     }

-#ifdef DEBUG_MIPSNET_DATA
-    printf("mipsnet: read addr=0x%02x val=0x%02x\n", addr, ret);
-#endif
+    trace_mipsnet_read(addr, ret);

     return ret;
 }
 
     return ret;
 }
 

-static void mipsnet_ioport_write(void *opaque, uint32_t addr, uint32_t val)
+static void mipsnet_ioport_write(void *opaque, target_phys_addr_t addr,
+                                 uint64_t val, unsigned int size)

 {
     MIPSnetState *s = opaque;
 
     addr &= 0x3f;
 {
     MIPSnetState *s = opaque;
 
     addr &= 0x3f;

-#ifdef DEBUG_MIPSNET_DATA
-    printf("mipsnet: write addr=0x%02x val=0x%02x\n", addr, val);
-#endif
+    trace_mipsnet_write(addr, val);

     switch (addr) {
     case MIPSNET_TX_DATA_COUNT:
        s->tx_count = (val <= MAX_ETH_FRAME_SIZE) ? val : 0;
     switch (addr) {
     case MIPSNET_TX_DATA_COUNT:
        s->tx_count = (val <= MAX_ETH_FRAME_SIZE) ? val : 0;


@@ -181,9 +172,7 @@ static void mipsnet_ioport_write(void *opaque, uint32_t addr, uint32_t val)
         s->tx_buffer[s->tx_written++] = val;
         if (s->tx_written == s->tx_count) {
             /* Send buffer. */
         s->tx_buffer[s->tx_written++] = val;
         if (s->tx_written == s->tx_count) {
             /* Send buffer. */

-#ifdef DEBUG_MIPSNET_SEND
-            printf("mipsnet: sending len=%d\n", s->tx_count);
-#endif
+            trace_mipsnet_send(s->tx_count);

             qemu_send_packet(&s->nic->nc, s->tx_buffer, s->tx_count);
             s->tx_count = s->tx_written = 0;
             s->intctl |= MIPSNET_INTCTL_TXDONE;
             qemu_send_packet(&s->nic->nc, s->tx_buffer, s->tx_count);
             s->tx_count = s->tx_written = 0;
             s->intctl |= MIPSNET_INTCTL_TXDONE;


@@ -202,87 +191,94 @@ static void mipsnet_ioport_write(void *opaque, uint32_t addr, uint32_t val)
     }
 }
 
     }
 }
 

-static void mipsnet_save(QEMUFile *f, void *opaque)
-{
-    MIPSnetState *s = opaque;
-
-    qemu_put_be32s(f, &s->busy);
-    qemu_put_be32s(f, &s->rx_count);
-    qemu_put_be32s(f, &s->rx_read);
-    qemu_put_be32s(f, &s->tx_count);
-    qemu_put_be32s(f, &s->tx_written);
-    qemu_put_be32s(f, &s->intctl);
-    qemu_put_buffer(f, s->rx_buffer, MAX_ETH_FRAME_SIZE);
-    qemu_put_buffer(f, s->tx_buffer, MAX_ETH_FRAME_SIZE);
-}
-
-static int mipsnet_load(QEMUFile *f, void *opaque, int version_id)
-{
-    MIPSnetState *s = opaque;
-
-    if (version_id > 0)
-        return -EINVAL;
-
-    qemu_get_be32s(f, &s->busy);
-    qemu_get_be32s(f, &s->rx_count);
-    qemu_get_be32s(f, &s->rx_read);
-    qemu_get_be32s(f, &s->tx_count);
-    qemu_get_be32s(f, &s->tx_written);
-    qemu_get_be32s(f, &s->intctl);
-    qemu_get_buffer(f, s->rx_buffer, MAX_ETH_FRAME_SIZE);
-    qemu_get_buffer(f, s->tx_buffer, MAX_ETH_FRAME_SIZE);
-
-    return 0;
-}
+static const VMStateDescription vmstate_mipsnet = {
+    .name = "mipsnet",
+    .version_id = 0,
+    .minimum_version_id = 0,
+    .minimum_version_id_old = 0,
+    .fields      = (VMStateField[]) {
+        VMSTATE_UINT32(busy, MIPSnetState),
+        VMSTATE_UINT32(rx_count, MIPSnetState),
+        VMSTATE_UINT32(rx_read, MIPSnetState),
+        VMSTATE_UINT32(tx_count, MIPSnetState),
+        VMSTATE_UINT32(tx_written, MIPSnetState),
+        VMSTATE_UINT32(intctl, MIPSnetState),
+        VMSTATE_BUFFER(rx_buffer, MIPSnetState),
+        VMSTATE_BUFFER(tx_buffer, MIPSnetState),
+        VMSTATE_END_OF_LIST()
+    }
+};

 
 

-static void mipsnet_cleanup(VLANClientState *nc)
+static void mipsnet_cleanup(NetClientState *nc)

 {
     MIPSnetState *s = DO_UPCAST(NICState, nc, nc)->opaque;
 
 {
     MIPSnetState *s = DO_UPCAST(NICState, nc, nc)->opaque;
 

-    unregister_savevm(NULL, "mipsnet", s);
-
-    isa_unassign_ioport(s->io_base, 36);
-
-    qemu_free(s);
+    s->nic = NULL;

 }
 
 static NetClientInfo net_mipsnet_info = {
 }
 
 static NetClientInfo net_mipsnet_info = {

-    .type = NET_CLIENT_TYPE_NIC,
+    .type = NET_CLIENT_OPTIONS_KIND_NIC,

     .size = sizeof(NICState),
     .can_receive = mipsnet_can_receive,
     .receive = mipsnet_receive,
     .cleanup = mipsnet_cleanup,
 };
 
     .size = sizeof(NICState),
     .can_receive = mipsnet_can_receive,
     .receive = mipsnet_receive,
     .cleanup = mipsnet_cleanup,
 };
 

-void mipsnet_init (int base, qemu_irq irq, NICInfo *nd)
+static const MemoryRegionOps mipsnet_ioport_ops = {
+    .read = mipsnet_ioport_read,
+    .write = mipsnet_ioport_write,
+    .impl.min_access_size = 1,
+    .impl.max_access_size = 4,
+};
+
+static int mipsnet_sysbus_init(SysBusDevice *dev)

 {
 {

-    MIPSnetState *s;
+    MIPSnetState *s = DO_UPCAST(MIPSnetState, busdev, dev);

 
 

-    qemu_check_nic_model(nd, "mipsnet");
+    memory_region_init_io(&s->io, &mipsnet_ioport_ops, s, "mipsnet-io", 36);
+    sysbus_init_mmio(dev, &s->io);
+    sysbus_init_irq(dev, &s->irq);

 
 

-    s = qemu_mallocz(sizeof(MIPSnetState));
+    s->nic = qemu_new_nic(&net_mipsnet_info, &s->conf,
+                          object_get_typename(OBJECT(dev)), dev->qdev.id, s);
+    qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a);

 
 

-    register_ioport_write(base, 36, 1, mipsnet_ioport_write, s);
-    register_ioport_read(base, 36, 1, mipsnet_ioport_read, s);
-    register_ioport_write(base, 36, 2, mipsnet_ioport_write, s);
-    register_ioport_read(base, 36, 2, mipsnet_ioport_read, s);
-    register_ioport_write(base, 36, 4, mipsnet_ioport_write, s);
-    register_ioport_read(base, 36, 4, mipsnet_ioport_read, s);
+    return 0;
+}

 
 

-    s->io_base = base;
-    s->irq = irq;
+static void mipsnet_sysbus_reset(DeviceState *dev)
+{
+    MIPSnetState *s = DO_UPCAST(MIPSnetState, busdev.qdev, dev);
+    mipsnet_reset(s);
+}

 
 

-    if (nd) {
-        memcpy(s->conf.macaddr.a, nd->macaddr, sizeof(nd->macaddr));
-        s->conf.vlan = nd->vlan;
-        s->conf.peer = nd->netdev;
+static Property mipsnet_properties[] = {
+    DEFINE_NIC_PROPERTIES(MIPSnetState, conf),
+    DEFINE_PROP_END_OF_LIST(),
+};

 
 

-        s->nic = qemu_new_nic(&net_mipsnet_info, &s->conf,
-                              nd->model, nd->name, s);
+static void mipsnet_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
+
+    k->init = mipsnet_sysbus_init;
+    dc->desc = "MIPS Simulator network device";
+    dc->reset = mipsnet_sysbus_reset;
+    dc->vmsd = &vmstate_mipsnet;
+    dc->props = mipsnet_properties;
+}

 
 

-        qemu_format_nic_info_str(&s->nic->nc, s->conf.macaddr.a);
-    }
+static TypeInfo mipsnet_info = {
+    .name          = "mipsnet",
+    .parent        = TYPE_SYS_BUS_DEVICE,
+    .instance_size = sizeof(MIPSnetState),
+    .class_init    = mipsnet_class_init,
+};

 
 

-    mipsnet_reset(s);
-    register_savevm(NULL, "mipsnet", 0, 0, mipsnet_save, mipsnet_load, s);
+static void mipsnet_register_types(void)
+{
+    type_register_static(&mipsnet_info);

 }
 }

+
+type_init(mipsnet_register_types)