exec.c: refactor function flatview_add_to_dispatch()
PATCH v3 1/1 exec.c: refactor function flatview_add_to_dispatch()
flatview_add_to_dispatch() registers page based on the condition of *section*, which may looks like this:
|s|PPPPPPP|s|
where s stands for subpage and P for page.
The procedure of this function could be described as:
- register first subpage
- register page
- register last subpage
This means the procedure could be simplified into these three steps instead of a loop iteration.
This patch refactors the function into three corresponding steps and adds some comment to clarify it.
---
v3:
* pass int128_make64() instead of 0 to int128_gt()
v2:
* removes the loop iteration as suggested by Paolo
--- exec.c | 50 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 17 deletions(-)
exec.c +33 -17
@@ -1598,34 +1598,50 @@ static void register_multipage(FlatView *fv,phys_page_set (d, start_addr >>TARGET_PAGE_BITS , num_pages, section_index); } +/* +* The range in *section* may look like this: +* +* |s|PPPPPPP|s| +* +* where s stands for subpage and P for page. +* +* The procedure in following function could be described as: +* +* - register first subpage +* - register page +* - register last subpage +*/ void flatview_add_to_dispatch (FlatView *fv,MemoryRegionSection *section) { -MemoryRegionSection now = *section, remain = *section; +MemoryRegionSection now, remain = *section;Int128 page_size =int128_make64 (TARGET_PAGE_SIZE ); -if (now.offset_within_address_space & ~TARGET_PAGE_MASK ) { -uint64_t left =TARGET_PAGE_ALIGN (now.offset_within_address_space) - - now.offset_within_address_space; +/* register first subpage */ +if (remain.offset_within_address_space & ~TARGET_PAGE_MASK ) { +uint64_t left =TARGET_PAGE_ALIGN (remain.offset_within_address_space) + - remain.offset_within_address_space; + now = remain; now.size =int128_min (int128_make64 (left), now.size); + remain.size =int128_sub (remain.size, now.size); + remain.offset_within_address_space +=int128_get64 (now.size); + remain.offset_within_region +=int128_get64 (now.size);register_subpage (fv, &now); - }else { - now.size =int128_zero (); } -while (int128_ne (remain.size, now.size)) { + +/* register page */ +if (int128_ge (remain.size, page_size)) { + now = remain; + now.size =int128_and (now.size,int128_neg (page_size)); remain.size =int128_sub (remain.size, now.size); remain.offset_within_address_space +=int128_get64 (now.size); remain.offset_within_region +=int128_get64 (now.size); - now = remain; -if (int128_lt (remain.size, page_size)) { -register_subpage (fv, &now); - }else if (remain.offset_within_address_space & ~TARGET_PAGE_MASK ) { - now.size = page_size; -register_subpage (fv, &now); - }else { - now.size =int128_and (now.size,int128_neg (page_size)); -register_multipage (fv, &now); - } +register_multipage (fv, &now); + } + +/* register last subpage */ +if (int128_gt (remain.size,int128_make64 (0 ))) { +register_subpage (fv, &remain); } }
Signature · 1 line
2.19.1
Quoted 40 lines · Wei Yang
flatview_add_to_dispatch()registers page based on the condition of *section*, which may looks like this:|s|PPPPPPP|s|where s stands for subpage and P for page.
The procedure of this function could be described as:
- register first subpage
- register page
- register last subpageThis means the procedure could be simplified into these three steps instead of a loop iteration.
This patch refactors the function into three corresponding steps and adds some comment to clarify it.
Signed-off-by Wei Yang <[email protected]>---
v3:
* passint128_make64()instead of 0 toint128_gt()
v2:
* removes the loop iteration as suggested by Paolo--- exec.c | 50 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 17 deletions(-)exec.c +2
-0@@ -1598,34 +1598,50 @@ static void register_multipage(FlatView *fv,phys_page_set (d, start_addr >>TARGET_PAGE_BITS , num_pages, section_index); } +/* +* The range in *section* may look like this:
exec.c static void register_multipage(FlatView *fv, · line 1612
Quoted 10 lines
exec.c +10
-0+* +* |s|PPPPPPP|s| +* +* where s stands for subpage and P for page. +* +* The procedure in following function could be described as: +* +* - register first subpage +* - register page +* - register last subpage
The last paragraph is a duplicate of the comments in the function, so it can be deleted. I did that and queued the patch.
Paolo
Quoted 53 lines
exec.c +21
-17+*/ void flatview_add_to_dispatch (FlatView *fv,MemoryRegionSection *section) { -MemoryRegionSection now = *section, remain = *section; +MemoryRegionSection now, remain = *section;Int128 page_size =int128_make64 (TARGET_PAGE_SIZE ); -if (now.offset_within_address_space & ~TARGET_PAGE_MASK ) { -uint64_t left =TARGET_PAGE_ALIGN (now.offset_within_address_space) - - now.offset_within_address_space; +/* register first subpage */ +if (remain.offset_within_address_space & ~TARGET_PAGE_MASK ) { +uint64_t left =TARGET_PAGE_ALIGN (remain.offset_within_address_space) + - remain.offset_within_address_space; + now = remain; now.size =int128_min (int128_make64 (left), now.size); + remain.size =int128_sub (remain.size, now.size); + remain.offset_within_address_space +=int128_get64 (now.size); + remain.offset_within_region +=int128_get64 (now.size);register_subpage (fv, &now); - }else { - now.size =int128_zero (); } -while (int128_ne (remain.size, now.size)) { + +/* register page */ +if (int128_ge (remain.size, page_size)) { + now = remain; + now.size =int128_and (now.size,int128_neg (page_size)); remain.size =int128_sub (remain.size, now.size); remain.offset_within_address_space +=int128_get64 (now.size); remain.offset_within_region +=int128_get64 (now.size); - now = remain; -if (int128_lt (remain.size, page_size)) { -register_subpage (fv, &now); - }else if (remain.offset_within_address_space & ~TARGET_PAGE_MASK ) { - now.size = page_size; -register_subpage (fv, &now); - }else { - now.size =int128_and (now.size,int128_neg (page_size)); -register_multipage (fv, &now); - } +register_multipage (fv, &now); + } + +/* register last subpage */ +if (int128_gt (remain.size,int128_make64 (0 ))) { +register_subpage (fv, &remain); } }
Quoted 39 lines · Paolo Bonzini
Quoted 38 lines · Wei Yang
flatview_add_to_dispatch()registers page based on the condition of *section*, which may looks like this:|s|PPPPPPP|s|where s stands for subpage and P for page.
The procedure of this function could be described as:
- register first subpage
- register page
- register last subpageThis means the procedure could be simplified into these three steps instead of a loop iteration.
This patch refactors the function into three corresponding steps and adds some comment to clarify it.
Signed-off-by Wei Yang <[email protected]>---
v3:
* passint128_make64()instead of 0 toint128_gt()
v2:
* removes the loop iteration as suggested by Paolo--- exec.c | 50 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 17 deletions(-)exec.c +0
-0@@ -1598,34 +1598,50 @@ static void register_multipage(FlatView *fv,phys_page_set (d, start_addr >>TARGET_PAGE_BITS , num_pages, section_index); }
Quoted 16 lines
exec.c static void register_multipage(FlatView *fv, · line 1612
Quoted 12 lines
exec.c +12
-0+/* +* The range in *section* may look like this: +* +* |s|PPPPPPP|s| +* +* where s stands for subpage and P for page. +* +* The procedure in following function could be described as: +* +* - register first subpage +* - register page +* - register last subpage The last paragraph is a duplicate of the comments in the function, so it can be deleted. I did that and queued the patch.
Thanks :-)
Quoted 55 lines
Paolo
Quoted 53 lines
exec.c +21
-17+*/ void flatview_add_to_dispatch (FlatView *fv,MemoryRegionSection *section) { -MemoryRegionSection now = *section, remain = *section; +MemoryRegionSection now, remain = *section;Int128 page_size =int128_make64 (TARGET_PAGE_SIZE ); -if (now.offset_within_address_space & ~TARGET_PAGE_MASK ) { -uint64_t left =TARGET_PAGE_ALIGN (now.offset_within_address_space) - - now.offset_within_address_space; +/* register first subpage */ +if (remain.offset_within_address_space & ~TARGET_PAGE_MASK ) { +uint64_t left =TARGET_PAGE_ALIGN (remain.offset_within_address_space) + - remain.offset_within_address_space; + now = remain; now.size =int128_min (int128_make64 (left), now.size); + remain.size =int128_sub (remain.size, now.size); + remain.offset_within_address_space +=int128_get64 (now.size); + remain.offset_within_region +=int128_get64 (now.size);register_subpage (fv, &now); - }else { - now.size =int128_zero (); } -while (int128_ne (remain.size, now.size)) { + +/* register page */ +if (int128_ge (remain.size, page_size)) { + now = remain; + now.size =int128_and (now.size,int128_neg (page_size)); remain.size =int128_sub (remain.size, now.size); remain.offset_within_address_space +=int128_get64 (now.size); remain.offset_within_region +=int128_get64 (now.size); - now = remain; -if (int128_lt (remain.size, page_size)) { -register_subpage (fv, &now); - }else if (remain.offset_within_address_space & ~TARGET_PAGE_MASK ) { - now.size = page_size; -register_subpage (fv, &now); - }else { - now.size =int128_and (now.size,int128_neg (page_size)); -register_multipage (fv, &now); - } +register_multipage (fv, &now); + } + +/* register last subpage */ +if (int128_gt (remain.size,int128_make64 (0 ))) { +register_subpage (fv, &remain); } }
Signature · 2 lines
Wei Yang Help you, Help me