Commit db3be60d authored by Edgar E. Iglesias's avatar Edgar E. Iglesias
Browse files

exec: Make stb_phys input an AddressSpace 



Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarEdgar E. Iglesias <edgar.iglesias@xilinx.com>
parent 5ce5944d

exec.c

+3 −3
Original line number Diff line number Diff line
@@ -1625,7 +1625,7 @@ static void watch_mem_write(void *opaque, hwaddr addr, 
    check_watchpoint(addr & ~TARGET_PAGE_MASK, ~(size - 1), BP_MEM_WRITE);

    switch (size) {

    case 1:

        stb_phys(addr, val);

        stb_phys(&address_space_memory, addr, val);

        break;

    case 2:

        stw_phys(&address_space_memory, addr, val);
@@ -2621,10 +2621,10 @@ void stl_be_phys(AddressSpace *as, hwaddr addr, uint32_t val) 
}



/* XXX: optimize */

void stb_phys(hwaddr addr, uint32_t val)

void stb_phys(AddressSpace *as, hwaddr addr, uint32_t val)

{

    uint8_t v = val;

    cpu_physical_memory_write(addr, &v, 1);

    address_space_rw(as, addr, &v, 1, 1);

}



/* warning: addr must be aligned */

hw/net/vmware_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static inline void 
vmw_shmem_st8(hwaddr addr, uint8_t value)

{

    VMW_SHPRN("SHMEM store8: %" PRIx64 " (value 0x%X)", addr, value);

    stb_phys(addr, value);

    stb_phys(&address_space_memory, addr, value);

}



static inline uint32_t

hw/ppc/ppc405_uc.c

+5 −5
Original line number Diff line number Diff line
@@ -63,27 +63,27 @@ ram_addr_t ppc405_set_bootinfo (CPUPPCState *env, ppc4xx_bd_info_t *bd, 
    stl_be_phys(cs->as, bdloc + 0x1C, bd->bi_bootflags);

    stl_be_phys(cs->as, bdloc + 0x20, bd->bi_ipaddr);

    for (i = 0; i < 6; i++) {

        stb_phys(bdloc + 0x24 + i, bd->bi_enetaddr[i]);

        stb_phys(cs->as, bdloc + 0x24 + i, bd->bi_enetaddr[i]);

    }

    stw_be_phys(cs->as, bdloc + 0x2A, bd->bi_ethspeed);

    stl_be_phys(cs->as, bdloc + 0x2C, bd->bi_intfreq);

    stl_be_phys(cs->as, bdloc + 0x30, bd->bi_busfreq);

    stl_be_phys(cs->as, bdloc + 0x34, bd->bi_baudrate);

    for (i = 0; i < 4; i++) {

        stb_phys(bdloc + 0x38 + i, bd->bi_s_version[i]);

        stb_phys(cs->as, bdloc + 0x38 + i, bd->bi_s_version[i]);

    }

    for (i = 0; i < 32; i++) {

        stb_phys(bdloc + 0x3C + i, bd->bi_r_version[i]);

        stb_phys(cs->as, bdloc + 0x3C + i, bd->bi_r_version[i]);

    }

    stl_be_phys(cs->as, bdloc + 0x5C, bd->bi_plb_busfreq);

    stl_be_phys(cs->as, bdloc + 0x60, bd->bi_pci_busfreq);

    for (i = 0; i < 6; i++) {

        stb_phys(bdloc + 0x64 + i, bd->bi_pci_enetaddr[i]);

        stb_phys(cs->as, bdloc + 0x64 + i, bd->bi_pci_enetaddr[i]);

    }

    n = 0x6A;

    if (flags & 0x00000001) {

        for (i = 0; i < 6; i++)

            stb_phys(bdloc + n++, bd->bi_pci_enetaddr2[i]);

            stb_phys(cs->as, bdloc + n++, bd->bi_pci_enetaddr2[i]);

    }

    stl_be_phys(cs->as, bdloc + n, bd->bi_opbfreq);

    n += 4;

hw/ppc/spapr_hcall.c

+3 −3
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static target_ulong register_vpa(CPUPPCState *env, target_ulong vpa) 


    tmp = ldub_phys(cs->as, env->vpa_addr + VPA_SHARED_PROC_OFFSET);

    tmp |= VPA_SHARED_PROC_VAL;

    stb_phys(env->vpa_addr + VPA_SHARED_PROC_OFFSET, tmp);

    stb_phys(cs->as, env->vpa_addr + VPA_SHARED_PROC_OFFSET, tmp);



    return H_SUCCESS;

}
@@ -567,7 +567,7 @@ static target_ulong h_logical_store(PowerPCCPU *cpu, sPAPREnvironment *spapr, 


    switch (size) {

    case 1:

        stb_phys(addr, val);

        stb_phys(cs->as, addr, val);

        return H_SUCCESS;

    case 2:

        stw_phys(cs->as, addr, val);
@@ -632,7 +632,7 @@ static target_ulong h_logical_memop(PowerPCCPU *cpu, sPAPREnvironment *spapr, 
        }

        switch (esize) {

        case 0:

            stb_phys(dst, tmp);

            stb_phys(cs->as, dst, tmp);

            break;

        case 1:

            stw_phys(cs->as, dst, tmp);

hw/s390x/s390-virtio-bus.c

+11 −5
Original line number Diff line number Diff line
@@ -359,15 +359,21 @@ void s390_virtio_device_sync(VirtIOS390Device *dev) 
    virtio_reset(dev->vdev);



    /* Sync dev space */

    stb_phys(dev->dev_offs + VIRTIO_DEV_OFFS_TYPE, dev->vdev->device_id);

    stb_phys(&address_space_memory,

             dev->dev_offs + VIRTIO_DEV_OFFS_TYPE, dev->vdev->device_id);



    stb_phys(dev->dev_offs + VIRTIO_DEV_OFFS_NUM_VQ, s390_virtio_device_num_vq(dev));

    stb_phys(dev->dev_offs + VIRTIO_DEV_OFFS_FEATURE_LEN, dev->feat_len);

    stb_phys(&address_space_memory,

             dev->dev_offs + VIRTIO_DEV_OFFS_NUM_VQ,

             s390_virtio_device_num_vq(dev));

    stb_phys(&address_space_memory,

             dev->dev_offs + VIRTIO_DEV_OFFS_FEATURE_LEN, dev->feat_len);



    stb_phys(dev->dev_offs + VIRTIO_DEV_OFFS_CONFIG_LEN, dev->vdev->config_len);

    stb_phys(&address_space_memory,

             dev->dev_offs + VIRTIO_DEV_OFFS_CONFIG_LEN, dev->vdev->config_len);



    num_vq = s390_virtio_device_num_vq(dev);

    stb_phys(dev->dev_offs + VIRTIO_DEV_OFFS_NUM_VQ, num_vq);

    stb_phys(&address_space_memory,

             dev->dev_offs + VIRTIO_DEV_OFFS_NUM_VQ, num_vq);



    /* Sync virtqueues */

    for (i = 0; i < num_vq; i++) {