bsd-user: Expand log_page_dump inline
We have extra stuff to log at the same time. Hoist the qemu_log_trylock/unlock to the caller and use fprintf. Reviewed-by: Alex Bennée <alex.bennee@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20220417183019.755276-22-richard.henderson@linaro.org>
This commit is contained in:
		
							parent
							
								
									fb6efecf54
								
							
						
					
					
						commit
						43b761618d
					
				| @ -503,20 +503,29 @@ int main(int argc, char **argv) | ||||
|     g_free(target_environ); | ||||
| 
 | ||||
|     if (qemu_loglevel_mask(CPU_LOG_PAGE)) { | ||||
|         qemu_log("guest_base  %p\n", (void *)guest_base); | ||||
|         log_page_dump("binary load"); | ||||
|         FILE *f = qemu_log_trylock(); | ||||
|         if (f) { | ||||
|             fprintf(f, "guest_base  %p\n", (void *)guest_base); | ||||
|             fprintf(f, "page layout changed following binary load\n"); | ||||
|             page_dump(f); | ||||
| 
 | ||||
|         qemu_log("start_brk   0x" TARGET_ABI_FMT_lx "\n", info->start_brk); | ||||
|         qemu_log("end_code    0x" TARGET_ABI_FMT_lx "\n", info->end_code); | ||||
|         qemu_log("start_code  0x" TARGET_ABI_FMT_lx "\n", | ||||
|                  info->start_code); | ||||
|         qemu_log("start_data  0x" TARGET_ABI_FMT_lx "\n", | ||||
|                  info->start_data); | ||||
|         qemu_log("end_data    0x" TARGET_ABI_FMT_lx "\n", info->end_data); | ||||
|         qemu_log("start_stack 0x" TARGET_ABI_FMT_lx "\n", | ||||
|                  info->start_stack); | ||||
|         qemu_log("brk         0x" TARGET_ABI_FMT_lx "\n", info->brk); | ||||
|         qemu_log("entry       0x" TARGET_ABI_FMT_lx "\n", info->entry); | ||||
|             fprintf(f, "start_brk   0x" TARGET_ABI_FMT_lx "\n", | ||||
|                     info->start_brk); | ||||
|             fprintf(f, "end_code    0x" TARGET_ABI_FMT_lx "\n", | ||||
|                     info->end_code); | ||||
|             fprintf(f, "start_code  0x" TARGET_ABI_FMT_lx "\n", | ||||
|                     info->start_code); | ||||
|             fprintf(f, "start_data  0x" TARGET_ABI_FMT_lx "\n", | ||||
|                     info->start_data); | ||||
|             fprintf(f, "end_data    0x" TARGET_ABI_FMT_lx "\n", | ||||
|                     info->end_data); | ||||
|             fprintf(f, "start_stack 0x" TARGET_ABI_FMT_lx "\n", | ||||
|                     info->start_stack); | ||||
|             fprintf(f, "brk         0x" TARGET_ABI_FMT_lx "\n", info->brk); | ||||
|             fprintf(f, "entry       0x" TARGET_ABI_FMT_lx "\n", info->entry); | ||||
| 
 | ||||
|             qemu_log_unlock(f); | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     /* build Task State */ | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Richard Henderson
						Richard Henderson