From patchwork Sun Apr 15 14:13:45 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 152613 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6A03CB6FEC for ; Mon, 16 Apr 2012 00:14:53 +1000 (EST) Received: from localhost ([::1]:48710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJQE7-0003ih-4b for incoming@patchwork.ozlabs.org; Sun, 15 Apr 2012 10:14:51 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJQDU-0003LE-47 for qemu-devel@nongnu.org; Sun, 15 Apr 2012 10:14:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SJQDR-0008GP-6K for qemu-devel@nongnu.org; Sun, 15 Apr 2012 10:14:11 -0400 Received: from v220110690675601.yourvserver.net ([78.47.199.172]:36155) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SJQDQ-0008Da-U4 for qemu-devel@nongnu.org; Sun, 15 Apr 2012 10:14:09 -0400 Received: from localhost (v220110690675601.yourvserver.net.local [127.0.0.1]) by v220110690675601.yourvserver.net (Postfix) with ESMTP id 7238472800B8; Sun, 15 Apr 2012 16:14:08 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at weilnetz.de Received: from v220110690675601.yourvserver.net ([127.0.0.1]) by localhost (v220110690675601.yourvserver.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3BR5ll+AxeZH; Sun, 15 Apr 2012 16:14:07 +0200 (CEST) Received: by v220110690675601.yourvserver.net (Postfix, from userid 1000) id 96EFA72800BE; Sun, 15 Apr 2012 16:14:05 +0200 (CEST) From: Stefan Weil To: qemu-devel@nongnu.org Date: Sun, 15 Apr 2012 16:13:45 +0200 Message-Id: <1334499233-6344-13-git-send-email-sw@weilnetz.de> X-Mailer: git-send-email 1.7.9 In-Reply-To: <1334499233-6344-1-git-send-email-sw@weilnetz.de> References: <1334499233-6344-1-git-send-email-sw@weilnetz.de> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 78.47.199.172 Cc: Blue Swirl , Stefan Weil Subject: [Qemu-devel] [PATCH 12/20] w64: Fix data types in softmmu*.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org w64 requires uintptr_t. Signed-off-by: Stefan Weil --- softmmu_header.h | 6 +++--- softmmu_template.h | 20 ++++++++------------ 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/softmmu_header.h b/softmmu_header.h index edc7826..77c95dc 100644 --- a/softmmu_header.h +++ b/softmmu_header.h @@ -111,7 +111,7 @@ glue(glue(glue(CPU_PREFIX, ld), USUFFIX), MEMSUFFIX)(ENV_PARAM mmu_idx); } else { uintptr_t physaddr = addr + env->tlb_table[mmu_idx][page_index].addend; - res = glue(glue(ld, USUFFIX), _raw)((uint8_t *)physaddr); + res = glue(glue(ld, USUFFIX), _raw)(physaddr); } return res; } @@ -134,7 +134,7 @@ glue(glue(glue(CPU_PREFIX, lds), SUFFIX), MEMSUFFIX)(ENV_PARAM MMUSUFFIX)(ENV_VAR addr, mmu_idx); } else { uintptr_t physaddr = addr + env->tlb_table[mmu_idx][page_index].addend; - res = glue(glue(lds, SUFFIX), _raw)((uint8_t *)physaddr); + res = glue(glue(lds, SUFFIX), _raw)(physaddr); } return res; } @@ -161,7 +161,7 @@ glue(glue(glue(CPU_PREFIX, st), SUFFIX), MEMSUFFIX)(ENV_PARAM target_ulong ptr, mmu_idx); } else { uintptr_t physaddr = addr + env->tlb_table[mmu_idx][page_index].addend; - glue(glue(st, SUFFIX), _raw)((uint8_t *)physaddr, v); + glue(glue(st, SUFFIX), _raw)(physaddr, v); } } diff --git a/softmmu_template.h b/softmmu_template.h index b285d78..8db33c1 100644 --- a/softmmu_template.h +++ b/softmmu_template.h @@ -112,7 +112,6 @@ glue(glue(glue(HELPER_PREFIX, ld), SUFFIX), MMUSUFFIX)(ENV_PARAM int index; target_ulong tlb_addr; target_phys_addr_t ioaddr; - unsigned long addend; uintptr_t retaddr; /* test if there is match for unaligned or IO access */ @@ -145,8 +144,8 @@ glue(glue(glue(HELPER_PREFIX, ld), SUFFIX), MMUSUFFIX)(ENV_PARAM do_unaligned_access(ENV_VAR addr, READ_ACCESS_TYPE, mmu_idx, retaddr); } #endif - addend = env->tlb_table[mmu_idx][index].addend; - res = glue(glue(ld, USUFFIX), _raw)((uint8_t *)(long)(addr+addend)); + uintptr_t addend = env->tlb_table[mmu_idx][index].addend; + res = glue(glue(ld, USUFFIX), _raw)((uint8_t *)(addr+addend)); } } else { /* the page is not in the TLB : fill it */ @@ -171,7 +170,6 @@ glue(glue(slow_ld, SUFFIX), MMUSUFFIX)(ENV_PARAM DATA_TYPE res, res1, res2; int index, shift; target_phys_addr_t ioaddr; - unsigned long addend; target_ulong tlb_addr, addr1, addr2; index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1); @@ -202,8 +200,8 @@ glue(glue(slow_ld, SUFFIX), MMUSUFFIX)(ENV_PARAM res = (DATA_TYPE)res; } else { /* unaligned/aligned access in the same page */ - addend = env->tlb_table[mmu_idx][index].addend; - res = glue(glue(ld, USUFFIX), _raw)((uint8_t *)(long)(addr+addend)); + uintptr_t addend = env->tlb_table[mmu_idx][index].addend; + res = glue(glue(ld, USUFFIX), _raw)((uint8_t *)(addr+addend)); } } else { /* the page is not in the TLB : fill it */ @@ -258,7 +256,6 @@ void glue(glue(glue(HELPER_PREFIX, st), SUFFIX), MMUSUFFIX)(ENV_PARAM int mmu_idx) { target_phys_addr_t ioaddr; - unsigned long addend; target_ulong tlb_addr; uintptr_t retaddr; int index; @@ -290,8 +287,8 @@ void glue(glue(glue(HELPER_PREFIX, st), SUFFIX), MMUSUFFIX)(ENV_PARAM do_unaligned_access(ENV_VAR addr, 1, mmu_idx, retaddr); } #endif - addend = env->tlb_table[mmu_idx][index].addend; - glue(glue(st, SUFFIX), _raw)((uint8_t *)(long)(addr+addend), val); + uintptr_t addend = env->tlb_table[mmu_idx][index].addend; + glue(glue(st, SUFFIX), _raw)((uint8_t *)(addr+addend), val); } } else { /* the page is not in the TLB : fill it */ @@ -313,7 +310,6 @@ static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(ENV_PARAM uintptr_t retaddr) { target_phys_addr_t ioaddr; - unsigned long addend; target_ulong tlb_addr; int index, i; @@ -345,8 +341,8 @@ static void glue(glue(slow_st, SUFFIX), MMUSUFFIX)(ENV_PARAM } } else { /* aligned/unaligned access in the same page */ - addend = env->tlb_table[mmu_idx][index].addend; - glue(glue(st, SUFFIX), _raw)((uint8_t *)(long)(addr+addend), val); + uintptr_t addend = env->tlb_table[mmu_idx][index].addend; + glue(glue(st, SUFFIX), _raw)((uint8_t *)(addr+addend), val); } } else { /* the page is not in the TLB : fill it */