[v3,06/20] exec: Tidy TARGET_PAGE_ALIGN

Message ID 20190922035458.14879-7-richard.henderson@linaro.org
State New
Headers show
Series
  • Move rom and notdirty handling to cputlb
Related show

Commit Message

Richard Henderson Sept. 22, 2019, 3:54 a.m.
Use TARGET_PAGE_MASK twice instead of TARGET_PAGE_SIZE once.
This is functionally identical, but will help a following patch.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---
 include/exec/cpu-all.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.17.1

Comments

David Hildenbrand Sept. 23, 2019, 8:30 a.m. | #1
On 22.09.19 05:54, Richard Henderson wrote:
> Use TARGET_PAGE_MASK twice instead of TARGET_PAGE_SIZE once.

> This is functionally identical, but will help a following patch.

> 

> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

> ---

>  include/exec/cpu-all.h | 3 ++-

>  1 file changed, 2 insertions(+), 1 deletion(-)

> 

> diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h

> index 34d36cebca..5246770271 100644

> --- a/include/exec/cpu-all.h

> +++ b/include/exec/cpu-all.h

> @@ -226,7 +226,8 @@ extern const TargetPageBits target_page;

>  

>  #define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS)

>  #define TARGET_PAGE_MASK ((target_long)-1 << TARGET_PAGE_BITS)

> -#define TARGET_PAGE_ALIGN(addr) (((addr) + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK)

> +#define TARGET_PAGE_ALIGN(addr) \

> +    (((addr) + ~TARGET_PAGE_MASK) & TARGET_PAGE_MASK)

>  

>  /* Using intptr_t ensures that qemu_*_page_mask is sign-extended even

>   * when intptr_t is 32-bit and we are aligning a long long.

> 


Reviewed-by: David Hildenbrand <david@redhat.com>


-- 

Thanks,

David / dhildenb

Patch

diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h
index 34d36cebca..5246770271 100644
--- a/include/exec/cpu-all.h
+++ b/include/exec/cpu-all.h
@@ -226,7 +226,8 @@  extern const TargetPageBits target_page;
 
 #define TARGET_PAGE_SIZE (1 << TARGET_PAGE_BITS)
 #define TARGET_PAGE_MASK ((target_long)-1 << TARGET_PAGE_BITS)
-#define TARGET_PAGE_ALIGN(addr) (((addr) + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK)
+#define TARGET_PAGE_ALIGN(addr) \
+    (((addr) + ~TARGET_PAGE_MASK) & TARGET_PAGE_MASK)
 
 /* Using intptr_t ensures that qemu_*_page_mask is sign-extended even
  * when intptr_t is 32-bit and we are aligning a long long.