gwh/x50ng
1
0
Fork 0
forked from Miroirs/x49gp
Code Pull requests Activity

fix offset calculations in qemu callbacks

Browse source
This commit is contained in:
Eddie C. Dost 2017-10-26 14:13:45 +02:00
parent eede585bc9
commit cd78bd8127
2 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
flash.c
View file

@ -322,19 +322,21 @@ flash_readb(void *opaque, target_phys_addr_t offset)
uint32_t shift; uint32_t shift;
unsigned char data; unsigned char data;
#ifdef QEMU_OLD
offset -= (target_phys_addr_t) phys_ram_base + flash->offset;
#endif
if (flash->state == FLASH_STATE_NORMAL) { if (flash->state == FLASH_STATE_NORMAL) {
offset -= (target_phys_addr_t) phys_ram_base;
data = *(datap + offset); data = *(datap + offset);
} else { } else {
offset -= 0;
temp = flash_get_halfword(flash, offset & ~(1)); temp = flash_get_halfword(flash, offset & ~(1));
shift = (offset & 1) << 3; shift = (offset & 1) << 3;
data = (temp >> shift) & 0xff; data = (temp >> shift) & 0xff;
} }
#ifdef DEBUG_X49GP_FLASH_READ #ifdef DEBUG_X49GP_FLASH_READ
printf("read FLASH 1 (state %u) at offset %08x: %02x\n", printf("read FLASH 1 (state %u) at offset %08lx: %02x\n",
flash->state, offset, data); flash->state, (unsigned long) offset, data);
#endif #endif
return data; return data;
@ -347,17 +349,19 @@ flash_readw(void *opaque, target_phys_addr_t offset)
uint8_t *datap = flash->data; uint8_t *datap = flash->data;
uint32_t data; uint32_t data;
#ifdef QEMU_OLD
offset -= (target_phys_addr_t) phys_ram_base + flash->offset;
#endif
if (flash->state == FLASH_STATE_NORMAL) { if (flash->state == FLASH_STATE_NORMAL) {
offset -= (target_phys_addr_t) phys_ram_base;
data = lduw_p(datap + offset); data = lduw_p(datap + offset);
} else { } else {
offset -= 0;
data = flash_get_halfword(flash, offset); data = flash_get_halfword(flash, offset);
} }
#ifdef DEBUG_X49GP_FLASH_READ #ifdef DEBUG_X49GP_FLASH_READ
printf("read FLASH 2 (state %u) at offset %08x: %04x\n", printf("read FLASH 2 (state %u) at offset %08lx: %04x\n",
flash->state, offset, data); flash->state, (unsigned long) offset, data);
#endif #endif
return data; return data;
@ -370,18 +374,20 @@ flash_readl(void *opaque, target_phys_addr_t offset)
uint8_t *datap = flash->data; uint8_t *datap = flash->data;
uint32_t data; uint32_t data;
#ifdef QEMU_OLD
offset -= (target_phys_addr_t) phys_ram_base + flash->offset;
#endif
if (flash->state == FLASH_STATE_NORMAL) { if (flash->state == FLASH_STATE_NORMAL) {
offset -= (target_phys_addr_t) phys_ram_base;
data = ldl_p(datap + offset); data = ldl_p(datap + offset);
} else { } else {
offset -= 0;
data = (flash_get_halfword(flash, offset + 2) << 16) | data = (flash_get_halfword(flash, offset + 2) << 16) |
(flash_get_halfword(flash, offset + 0) << 0); (flash_get_halfword(flash, offset + 0) << 0);
} }
#ifdef DEBUG_X49GP_FLASH_READ #ifdef DEBUG_X49GP_FLASH_READ
printf("read FLASH 4 (state %u) at offset %08x: %08x\n", printf("read FLASH 4 (state %u) at offset %08lx: %08x\n",
flash->state, offset, data); flash->state, (unsigned long) offset, data);
#endif #endif
return data; return data;
@ -393,15 +399,14 @@ flash_writeb(void *opaque, target_phys_addr_t offset, uint32_t data)
x49gp_flash_t *flash = opaque; x49gp_flash_t *flash = opaque;
uint32_t shift; uint32_t shift;
if (flash->state == FLASH_STATE_NORMAL) #ifdef QEMU_OLD
offset -= (target_phys_addr_t) phys_ram_base; offset -= (target_phys_addr_t) phys_ram_base + flash->offset;
else #endif
offset -= 0;
data &= 0xff; data &= 0xff;
#ifdef DEBUG_X49GP_FLASH_WRITE #ifdef DEBUG_X49GP_FLASH_WRITE
printf("write FLASH 1 (state %u) at offset %08x: %02x\n", printf("write FLASH 1 (state %u) at offset %08lx: %02x\n",
flash->state, offset, data); flash->state, offset, data);
#endif #endif
@ -419,15 +424,14 @@ flash_writew(void *opaque, target_phys_addr_t offset, uint32_t data)
{ {
x49gp_flash_t *flash = opaque; x49gp_flash_t *flash = opaque;
if (flash->state == FLASH_STATE_NORMAL) #ifdef QEMU_OLD
offset -= (target_phys_addr_t) phys_ram_base; offset -= (target_phys_addr_t) phys_ram_base + flash->offset;
else #endif
offset -= 0;
data &= 0xffff; data &= 0xffff;
#ifdef DEBUG_X49GP_FLASH_WRITE #ifdef DEBUG_X49GP_FLASH_WRITE
printf("write FLASH 2 (state %u) at offset %08x: %04x\n", printf("write FLASH 2 (state %u) at offset %08lx: %04x\n",
flash->state, offset, data); flash->state, offset, data);
#endif #endif
@ -439,13 +443,12 @@ flash_writel(void *opaque, target_phys_addr_t offset, uint32_t data)
{ {
x49gp_flash_t *flash = opaque; x49gp_flash_t *flash = opaque;
if (flash->state == FLASH_STATE_NORMAL) #ifdef QEMU_OLD
offset -= (target_phys_addr_t) phys_ram_base; offset -= (target_phys_addr_t) phys_ram_base + flash->offset;
else #endif
offset -= 0;
#ifdef DEBUG_X49GP_FLASH_WRITE #ifdef DEBUG_X49GP_FLASH_WRITE
printf("write FLASH 4 (state %u) at offset %08x: %08x\n", printf("write FLASH 4 (state %u) at offset %08lx: %08x\n",
flash->state, offset, data); flash->state, offset, data);
#endif #endif

9
sram.c
View file

@ -387,7 +387,7 @@ sram_get_word(void *opaque, target_phys_addr_t offset)
uint32_t data; uint32_t data;
#ifdef QEMU_OLD #ifdef QEMU_OLD
offset -= S3C2410_SRAM_BASE; offset -= (target_phys_addr_t)phys_ram_base + sram->offset;
#endif #endif
data = ldl_p(sram->data + offset); data = ldl_p(sram->data + offset);
@ -423,7 +423,7 @@ sram_get_halfword(void *opaque, target_phys_addr_t offset)
unsigned short data; unsigned short data;
#ifdef QEMU_OLD #ifdef QEMU_OLD
offset -= S3C2410_SRAM_BASE; offset -= (target_phys_addr_t)phys_ram_base + sram->offset;
#endif #endif
data = lduw_p(sram->data + offset); data = lduw_p(sram->data + offset);
@ -453,7 +453,7 @@ sram_get_byte(void *opaque, target_phys_addr_t offset)
unsigned char data; unsigned char data;
#ifdef QEMU_OLD #ifdef QEMU_OLD
offset -= S3C2410_SRAM_BASE; offset -= (target_phys_addr_t)phys_ram_base + sram->offset;
#endif #endif
data = ldub_p(sram->data + offset); data = ldub_p(sram->data + offset);
@ -482,7 +482,6 @@ sram_put_word(void *opaque, target_phys_addr_t offset, uint32_t data)
x49gp_sram_t *sram = opaque; x49gp_sram_t *sram = opaque;
#ifdef QEMU_OLD #ifdef QEMU_OLD
// offset -= S3C2410_SRAM_BASE;
offset -= (target_phys_addr_t)phys_ram_base + sram->offset; offset -= (target_phys_addr_t)phys_ram_base + sram->offset;
#endif #endif
@ -533,7 +532,6 @@ sram_put_halfword(void *opaque, target_phys_addr_t offset, uint32_t data)
x49gp_sram_t *sram = opaque; x49gp_sram_t *sram = opaque;
#ifdef QEMU_OLD #ifdef QEMU_OLD
// offset -= S3C2410_SRAM_BASE;
offset -= (target_phys_addr_t)phys_ram_base + sram->offset; offset -= (target_phys_addr_t)phys_ram_base + sram->offset;
#endif #endif
data &= 0xffff; data &= 0xffff;
@ -563,7 +561,6 @@ sram_put_byte(void *opaque, target_phys_addr_t offset, uint32_t data)
x49gp_sram_t *sram = opaque; x49gp_sram_t *sram = opaque;
#ifdef QEMU_OLD #ifdef QEMU_OLD
// offset -= S3C2410_SRAM_BASE;
offset -= (target_phys_addr_t)phys_ram_base + sram->offset; offset -= (target_phys_addr_t)phys_ram_base + sram->offset;
#endif #endif
data &= 0xff; data &= 0xff;