OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

xen-all.c: fix multiply issue for int and uint types

Browse Source 
If the two multiply operands are int and uint types separately,
the int type will be transformed to uint firstly, which is not the
intent in our code piece. The fix is to add (int64_t) transform
for the uint type before the multiply.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
This commit is contained in:
Dongxiao Xu 2012-08-22 10:17:43 +00:00 committed by Stefano Stabellini
parent 27b7652ef5
commit 14d4018372
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xen-all.c
View File

@ -712,7 +712,8 @@ static void cpu_ioreq_pio(ioreq_t *req)
for (i = 0; i < req->count; i++) { for (i = 0; i < req->count; i++) {
tmp = do_inp(req->addr, req->size); tmp = do_inp(req->addr, req->size);
cpu_physical_memory_write(req->data + (sign * i * req->size), cpu_physical_memory_write(
req->data + (sign * i * (int64_t)req->size),
(uint8_t *) &tmp, req->size); (uint8_t *) &tmp, req->size);
} }
} }
@ -723,7 +724,8 @@ static void cpu_ioreq_pio(ioreq_t *req)
for (i = 0; i < req->count; i++) { for (i = 0; i < req->count; i++) {
uint32_t tmp = 0; uint32_t tmp = 0;
cpu_physical_memory_read(req->data + (sign * i * req->size), cpu_physical_memory_read(
req->data + (sign * i * (int64_t)req->size),
(uint8_t*) &tmp, req->size); (uint8_t*) &tmp, req->size);
do_outp(req->addr, req->size, tmp); do_outp(req->addr, req->size, tmp);
} }
@ -740,12 +742,14 @@ static void cpu_ioreq_move(ioreq_t *req)
if (!req->data_is_ptr) { if (!req->data_is_ptr) {
if (req->dir == IOREQ_READ) { if (req->dir == IOREQ_READ) {
for (i = 0; i < req->count; i++) { for (i = 0; i < req->count; i++) {
cpu_physical_memory_read(req->addr + (sign * i * req->size), cpu_physical_memory_read(
req->addr + (sign * i * (int64_t)req->size),
(uint8_t *) &req->data, req->size); (uint8_t *) &req->data, req->size);
} }
} else if (req->dir == IOREQ_WRITE) { } else if (req->dir == IOREQ_WRITE) {
for (i = 0; i < req->count; i++) { for (i = 0; i < req->count; i++) {
cpu_physical_memory_write(req->addr + (sign * i * req->size), cpu_physical_memory_write(
req->addr + (sign * i * (int64_t)req->size),
(uint8_t *) &req->data, req->size); (uint8_t *) &req->data, req->size);
} }
} }
@ -754,16 +758,20 @@ static void cpu_ioreq_move(ioreq_t *req)
if (req->dir == IOREQ_READ) { if (req->dir == IOREQ_READ) {
for (i = 0; i < req->count; i++) { for (i = 0; i < req->count; i++) {
cpu_physical_memory_read(req->addr + (sign * i * req->size), cpu_physical_memory_read(
req->addr + (sign * i * (int64_t)req->size),
(uint8_t*) &tmp, req->size); (uint8_t*) &tmp, req->size);
cpu_physical_memory_write(req->data + (sign * i * req->size), cpu_physical_memory_write(
req->data + (sign * i * (int64_t)req->size),
(uint8_t*) &tmp, req->size); (uint8_t*) &tmp, req->size);
} }
} else if (req->dir == IOREQ_WRITE) { } else if (req->dir == IOREQ_WRITE) {
for (i = 0; i < req->count; i++) { for (i = 0; i < req->count; i++) {
cpu_physical_memory_read(req->data + (sign * i * req->size), cpu_physical_memory_read(
req->data + (sign * i * (int64_t)req->size),
(uint8_t*) &tmp, req->size); (uint8_t*) &tmp, req->size);
cpu_physical_memory_write(req->addr + (sign * i * req->size), cpu_physical_memory_write(
req->addr + (sign * i * (int64_t)req->size),
(uint8_t*) &tmp, req->size); (uint8_t*) &tmp, req->size);
} }
} }