From e60538c79fc7285e72f5b431281986737db1607b Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 23 Dec 2014 22:11:18 +0000 Subject: target-sparc: address_mask(), asi_address_mask() are TARGET_SPARC64 only The address_mask() and asi_address_mask() functions are only used in TARGET_SPARC64 configs, so guard with ifdefs to avoid warnings about unused functions in 32-bit builds. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Signed-off-by: Mark Cave-Ayland --- target-sparc/ldst_helper.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'target-sparc/ldst_helper.c') diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c index e62228c998..cdc21d3325 100644 --- a/target-sparc/ldst_helper.c +++ b/target-sparc/ldst_helper.c @@ -250,6 +250,7 @@ static void replace_tlb_1bit_lru(SparcTLBEntry *tlb, #endif +#if defined(TARGET_SPARC64) || defined(CONFIG_USER_ONLY) static inline target_ulong address_mask(CPUSPARCState *env1, target_ulong addr) { #ifdef TARGET_SPARC64 @@ -259,6 +260,7 @@ static inline target_ulong address_mask(CPUSPARCState *env1, target_ulong addr) #endif return addr; } +#endif /* returns true if access using this ASI is to have address translated by MMU otherwise access is to raw physical address */ @@ -287,6 +289,7 @@ static inline int is_translating_asi(int asi) #endif } +#ifdef TARGET_SPARC64 static inline target_ulong asi_address_mask(CPUSPARCState *env, int asi, target_ulong addr) { @@ -296,6 +299,7 @@ static inline target_ulong asi_address_mask(CPUSPARCState *env, return addr; } } +#endif void helper_check_align(CPUSPARCState *env, target_ulong addr, uint32_t align) { -- cgit 1.4.1 From 69694625e86aebb135b56c4aaafefd5c1d17bb3c Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 23 Dec 2014 22:11:19 +0000 Subject: target-sparc: is_translating_asi() is TARGET_SPARC64 only Move the is_translating_asi() inside the TARGET_SPARC64 ifdef (and remove the unimplemented 32-bit codepath), as it is only called from TARGET_SPARC64 code. This fixes a clang 3.4 unused-function warning. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Signed-off-by: Mark Cave-Ayland --- target-sparc/ldst_helper.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'target-sparc/ldst_helper.c') diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c index cdc21d3325..c7ad47d35c 100644 --- a/target-sparc/ldst_helper.c +++ b/target-sparc/ldst_helper.c @@ -262,11 +262,12 @@ static inline target_ulong address_mask(CPUSPARCState *env1, target_ulong addr) } #endif +#ifdef TARGET_SPARC64 /* returns true if access using this ASI is to have address translated by MMU otherwise access is to raw physical address */ +/* TODO: check sparc32 bits */ static inline int is_translating_asi(int asi) { -#ifdef TARGET_SPARC64 /* Ultrasparc IIi translating asi - note this list is defined by cpu implementation */ @@ -283,13 +284,8 @@ static inline int is_translating_asi(int asi) default: return 0; } -#else - /* TODO: check sparc32 bits */ - return 0; -#endif } -#ifdef TARGET_SPARC64 static inline target_ulong asi_address_mask(CPUSPARCState *env, int asi, target_ulong addr) { -- cgit 1.4.1