From e9d18387b71ad84240e57d77ab6d588d76121f1d Mon Sep 17 00:00:00 2001
From: Patryk Obara <dreamer.tan@gmail.com>
Date: Sun, 1 Mar 2020 05:36:09 +0100
Subject: [PATCH] Fix format warnings in cpu (dyn_fpu_esc3)

---
 src/cpu/core_dyn_x86/dyn_fpu.h    | 22 ++++++++++------------
 src/cpu/core_dyn_x86/dyn_fpu_dh.h |  2 +-
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/cpu/core_dyn_x86/dyn_fpu.h b/src/cpu/core_dyn_x86/dyn_fpu.h
index ce0b6cbe..eb583bac 100644
--- a/src/cpu/core_dyn_x86/dyn_fpu.h
+++ b/src/cpu/core_dyn_x86/dyn_fpu.h
@@ -357,16 +357,16 @@ static void dyn_fpu_esc2(){
 }
 
 static void dyn_fpu_esc3(){
-	dyn_get_modrm();  
+	dyn_get_modrm();
+	const unsigned group = (decode.modrm.val >> 3) & 7;
+	const unsigned sub = (decode.modrm.val & 7);
 	if (decode.modrm.val >= 0xc0) { 
-		Bitu group=(decode.modrm.val >> 3) & 7;
-		Bitu sub=(decode.modrm.val & 7);
 		switch (group) {
 		case 0x04:
 			switch (sub) {
 			case 0x00:				//FNENI
 			case 0x01:				//FNDIS
-				LOG(LOG_FPU,LOG_ERROR)("8087 only fpu code used esc 3: group 4: subfunction: %lu", sub);
+				LOG(LOG_FPU,LOG_ERROR)("8087 only fpu code used esc 3: group 4: subfunction: %u", sub);
 				break;
 			case 0x02:				//FNCLEX FCLEX
 				gen_call_function((void*)&FPU_FCLEX,"");
@@ -376,21 +376,19 @@ static void dyn_fpu_esc3(){
 				break;
 			case 0x04:				//FNSETPM
 			case 0x05:				//FRSTPM
-//				LOG(LOG_FPU,LOG_ERROR)("80267 protected mode (un)set. Nothing done");
+				// LOG(LOG_FPU,LOG_ERROR)("80267 protected mode (un)set. Nothing done");
 				break;
 			default:
-				E_Exit("ESC 3:ILLEGAL OPCODE group %lu subfunction %lu", group, sub);
+				E_Exit("ESC 3:ILLEGAL OPCODE group %u subfunction %u", group, sub);
 			}
 			break;
 		default:
-			LOG(LOG_FPU,LOG_WARN)("ESC 3:Unhandled group %lu subfunction %lu", group, sub);
+			LOG(LOG_FPU,LOG_WARN)("ESC 3:Unhandled group %u subfunction %u", group, sub);
 			break;
 		}
 	} else {
-		Bitu group=(decode.modrm.val >> 3) & 7;
-		Bitu sub=(decode.modrm.val & 7);
 		dyn_fill_ea(); 
-		switch(group){
+		switch (group) {
 		case 0x00:	/* FILD */
 			gen_call_function((void*)&FPU_PREP_PUSH,"");
 			gen_protectflags(); 
@@ -398,7 +396,7 @@ static void dyn_fpu_esc3(){
 			gen_call_function((void*)&FPU_FLD_I32,"%Drd%Drd",DREG(EA),DREG(TMPB));
 			break;
 		case 0x01:	/* FISTTP */
-			LOG(LOG_FPU,LOG_WARN)("ESC 3 EA:Unhandled group %lu subfunction %lu", group, sub);
+			LOG(LOG_FPU,LOG_WARN)("ESC 3 EA:Unhandled group %u subfunction %u", group, sub);
 			break;
 		case 0x02:	/* FIST */
 			gen_call_function((void*)&FPU_FST_I32,"%Drd",DREG(EA));
@@ -416,7 +414,7 @@ static void dyn_fpu_esc3(){
 			gen_call_function((void*)&FPU_FPOP,"");
 			break;
 		default:
-			LOG(LOG_FPU,LOG_WARN)("ESC 3 EA:Unhandled group %lu subfunction %lu", group, sub);
+			LOG(LOG_FPU,LOG_WARN)("ESC 3 EA:Unhandled group %u subfunction %u", group, sub);
 		}
 	}
 }
diff --git a/src/cpu/core_dyn_x86/dyn_fpu_dh.h b/src/cpu/core_dyn_x86/dyn_fpu_dh.h
index bd68500f..d002334a 100644
--- a/src/cpu/core_dyn_x86/dyn_fpu_dh.h
+++ b/src/cpu/core_dyn_x86/dyn_fpu_dh.h
@@ -230,7 +230,7 @@ static void dh_fpu_esc2(){
 }
 
 static void dh_fpu_esc3(){
-	dyn_get_modrm();  
+	dyn_get_modrm();
 	const unsigned group = (decode.modrm.val >> 3) & 7;
 	const unsigned sub = (decode.modrm.val & 7);
 	if (decode.modrm.val >= 0xc0) {