File 0007-C-11-requires-a-space-between-literal-and-... of Package es40

Overview Repositories Revisions Requests Users Attributes Meta

File 0007-C-11-requires-a-space-between-literal-and-string-mac.patch of Package es40 (Revision 99dcf900cbd188ff51782ca811d99f3d)

Currently displaying revision 99dcf900cbd188ff51782ca811d99f3d , Show latest

From f73b2bb6dee733542f58197a6c972112f6a627bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@gmail.com>
Date: Fri, 22 Dec 2023 19:57:15 +0100
Subject: [PATCH 07/10] C++11 requires a space between literal and string macro
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Klaus Kämpf <kkaempf@gmail.com>
---
 src/AlphaCPU.cpp    | 14 +++----
 src/TraceEngine.cpp | 98 ++++++++++++++++++++++-----------------------
 src/cpu_debug.h     | 56 +++++++++++++-------------
 3 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/src/AlphaCPU.cpp b/src/AlphaCPU.cpp
index 053804f..41672cb 100644
--- a/src/AlphaCPU.cpp
+++ b/src/AlphaCPU.cpp
@@ -1345,7 +1345,7 @@ void CAlphaCPU::listing(u64 from, u64 to)
  **/
 void CAlphaCPU::listing(u64 from, u64 to, u64 mark)
 {
-  printf("%%CPU-I-LISTNG: Listing from %016"LL "x to %016"LL "x\n", from, to);
+  printf("%%CPU-I-LISTNG: Listing from %016" LL "x to %016" LL "x\n", from, to);
 
   u64   iSavedPC;
   bool  bSavedDebug;
@@ -1562,7 +1562,7 @@ int CAlphaCPU::virt2phys(u64 virt, u64* phys, int flags, bool* asm_bit, u32 ins)
 #if defined(IDB)
     if(bTB_Debug)
 #endif
-      printf("TB %"LL "x,%x: ", virt, flags);
+      printf("TB %" LL "x,%x: ", virt, flags);
 #endif
 
   // try superpage first.
@@ -1867,7 +1867,7 @@ int CAlphaCPU::virt2phys(u64 virt, u64* phys, int flags, bool* asm_bit, u32 ins)
 #if defined(IDB)
     if(bTB_Debug)
 #endif
-      printf("phys: %"LL "x - OK\n", *phys);
+      printf("phys: %" LL "x - OK\n", *phys);
 #endif
   return 0;
 }
@@ -1968,10 +1968,10 @@ void CAlphaCPU::add_tb(u64 virt, u64 pte_phys, u64 pte_flags, int flags)
 #endif
   {
     printf("Add TB---------------------------------------\n");
-    printf("Map VIRT    %016"LL "x\n", state.tb[i].virt);
-    printf("Matching    %016"LL "x\n", state.tb[i].match_mask);
-    printf("And keeping %016"LL "x\n", state.tb[i].keep_mask);
-    printf("To PHYS     %016"LL "x\n", state.tb[i].phys);
+    printf("Map VIRT    %016" LL "x\n", state.tb[i].virt);
+    printf("Matching    %016" LL "x\n", state.tb[i].match_mask);
+    printf("And keeping %016" LL "x\n", state.tb[i].keep_mask);
+    printf("To PHYS     %016" LL "x\n", state.tb[i].phys);
     printf("Read : %c%c%c%c %c\n", state.tb[i].access[0][0] ? 'K' : '-',
            state.tb[i].access[0][1] ? 'E' : '-',
            state.tb[i].access[0][2] ? 'S' : '-',
diff --git a/src/TraceEngine.cpp b/src/TraceEngine.cpp
index 2aca1f7..02c7c6f 100644
--- a/src/TraceEngine.cpp
+++ b/src/TraceEngine.cpp
@@ -272,11 +272,11 @@ void CTraceEngine::trace(CAlphaCPU*  cpu, u64 f, u64 t, bool down, bool up,
     {
       /* Process context switch has happened. Print this in the trace files for
          both the old and the new process context. */
-      fprintf(asPRBRs[o].f, "\n==>   Switch to PRBR %08"LL "x %08"LL "x (%s)\n",
+      fprintf(asPRBRs[o].f, "\n==>   Switch to PRBR %08" LL "x %08" LL "x (%s)\n",
               asPRBRs[p].prbr, asPRBRs[p].hwpcb, asPRBRs[p].procname);
-      fprintf(asPRBRs[p].f, "        This is PRBR %08"LL "x %08"LL "x (%s)\n",
+      fprintf(asPRBRs[p].f, "        This is PRBR %08" LL "x %08" LL "x (%s)\n",
               asPRBRs[p].prbr, asPRBRs[p].hwpcb, asPRBRs[p].procname);
-      fprintf(asPRBRs[p].f, "<== Switch from PRBR %08"LL "x %08"LL "x (%s)\n\n",
+      fprintf(asPRBRs[p].f, "<== Switch from PRBR %08" LL "x %08" LL "x (%s)\n\n",
               asPRBRs[o].prbr, asPRBRs[o].hwpcb, asPRBRs[o].procname);
     }
 
@@ -344,7 +344,7 @@ void CTraceEngine::trace(CAlphaCPU*  cpu, u64 f, u64 t, bool down, bool up,
           fprintf(asPRBRs[p].f, " ");
         
         // And print the from address, and the value of the r0 register (return value)
-        fprintf(asPRBRs[p].f, "%016"LL "x(%08"LL "x) ($r0 = %"LL "x)\n", f,
+        fprintf(asPRBRs[p].f, "%016" LL "x(%08" LL "x) ($r0 = %" LL "x)\n", f,
                 pc_f, cpu->get_r(0, true));
 
         // Indent to the new (lower) trace level
@@ -352,7 +352,7 @@ void CTraceEngine::trace(CAlphaCPU*  cpu, u64 f, u64 t, bool down, bool up,
           fprintf(asPRBRs[p].f, " ");
 
         // Print the to address
-        fprintf(asPRBRs[p].f, "%016"LL "x(%08"LL "x) <--\n", t, pc_t);
+        fprintf(asPRBRs[p].f, "%016" LL "x(%08" LL "x) <--\n", t, pc_t);
         return;
       }
     }
@@ -393,7 +393,7 @@ void CTraceEngine::trace(CAlphaCPU*  cpu, u64 f, u64 t, bool down, bool up,
     fprintf(asPRBRs[p].f, " ");
 
   // Print the from address
-  fprintf(asPRBRs[p].f, "%016"LL "x(%08"LL "x) -->\n", f, pc_f);
+  fprintf(asPRBRs[p].f, "%016" LL "x(%08" LL "x) -->\n", f, pc_f);
 
   // Indent to the new (higher) trace level
   for(i = 0; i < asPRBRs[p].trclvl; i++)
@@ -407,7 +407,7 @@ void CTraceEngine::trace(CAlphaCPU*  cpu, u64 f, u64 t, bool down, bool up,
       // Function found
 
       // Print function name
-      fprintf(asPRBRs[p].f, "%016"LL "x(%s)", t, asFunctions[i].fn_name);
+      fprintf(asPRBRs[p].f, "%016" LL "x(%s)", t, asFunctions[i].fn_name);
 
       // And print the argument list
       write_arglist(cpu, asPRBRs[p].f, asFunctions[i].fn_arglist);
@@ -423,7 +423,7 @@ void CTraceEngine::trace(CAlphaCPU*  cpu, u64 f, u64 t, bool down, bool up,
   // No known function
 
   // Print the to address
-  fprintf(asPRBRs[p].f, "%016"LL "x(%08"LL "x)", t, pc_t);
+  fprintf(asPRBRs[p].f, "%016" LL "x(%08" LL "x)", t, pc_t);
 
   // Print a default argument list
   write_arglist(cpu, asPRBRs[p].f, "(%s|16%, %s|17%, %s|18%, %s|19%)");
@@ -476,11 +476,11 @@ void CTraceEngine::trace_br(CAlphaCPU* cpu, u64 f, u64 t)
     {
       /* Process context switch has happened. Print this in the trace files for
          both the old and the new process context. */
-      fprintf(asPRBRs[o].f, "\n==>   Switch to PRBR %08"LL "x %08"LL "x (%s)\n",
+      fprintf(asPRBRs[o].f, "\n==>   Switch to PRBR %08" LL "x %08" LL "x (%s)\n",
               asPRBRs[p].prbr, asPRBRs[p].hwpcb, asPRBRs[p].procname);
-      fprintf(asPRBRs[p].f, "        This is PRBR %08"LL "x %08"LL "x (%s)\n",
+      fprintf(asPRBRs[p].f, "        This is PRBR %08" LL "x %08" LL "x (%s)\n",
               asPRBRs[p].prbr, asPRBRs[p].hwpcb, asPRBRs[p].procname);
-      fprintf(asPRBRs[p].f, "<== Switch from PRBR %08"LL "x %08"LL "x (%s)\n\n",
+      fprintf(asPRBRs[p].f, "<== Switch from PRBR %08" LL "x %08" LL "x (%s)\n\n",
               asPRBRs[o].prbr, asPRBRs[o].hwpcb, asPRBRs[o].procname);
     }
 
@@ -498,7 +498,7 @@ void CTraceEngine::trace_br(CAlphaCPU* cpu, u64 f, u64 t)
       fprintf(asPRBRs[p].f, " ");
     
     // Print from address
-    fprintf(asPRBRs[p].f, "%016"LL "x(%08"LL "x) --+\n", f, pc_f);
+    fprintf(asPRBRs[p].f, "%016" LL "x(%08" LL "x) --+\n", f, pc_f);
 
     // Indent to the trace level
     for(i = 0; i < asPRBRs[p].trclvl; i++)
@@ -512,7 +512,7 @@ void CTraceEngine::trace_br(CAlphaCPU* cpu, u64 f, u64 t)
         // Yes, this is a known function
 
         // Print the function name
-        fprintf(asPRBRs[p].f, "%016"LL "x(%s)", t, asFunctions[i].fn_name);
+        fprintf(asPRBRs[p].f, "%016" LL "x(%s)", t, asFunctions[i].fn_name);
 
         // Print the argument list
         write_arglist(cpu, asPRBRs[p].f, asFunctions[i].fn_arglist);
@@ -526,7 +526,7 @@ void CTraceEngine::trace_br(CAlphaCPU* cpu, u64 f, u64 t)
     }
 
     // Print the to address. (No function call, so, no argument list)
-    fprintf(asPRBRs[p].f, "%016"LL "x(%08"LL "x) <-+\n", t, pc_t);
+    fprintf(asPRBRs[p].f, "%016" LL "x(%08" LL "x) <-+\n", t, pc_t);
   }
 }
 
@@ -616,7 +616,7 @@ int CTraceEngine::get_prbr(u64 prbr, u64 hwpcb)
     strncpy(asPRBRs[i].procname, cSystem->PtrToMem(prbr + 0x154), 20);
   else
     strcpy(asPRBRs[i].procname, "");
-  sprintf(filename, "trace_%08"LL "x_%08"LL "x_%02d_%s.trc", prbr, hwpcb,
+  sprintf(filename, "trace_%08" LL "x_%08" LL "x_%02d_%s.trc", prbr, hwpcb,
           asPRBRs[i].generation, asPRBRs[i].procname);
   asPRBRs[i].f = fopen(filename, "w");
   if(asPRBRs[i].f == 0)
@@ -625,7 +625,7 @@ int CTraceEngine::get_prbr(u64 prbr, u64 hwpcb)
   asPRBRs[i].trchide = -1;
   asPRBRs[i].trc_waitfor = 0;
   current_trace_file = asPRBRs[i].f;
-  printf("Add PRBR: %08"LL "x_%08"LL "x\n", prbr, hwpcb);
+  printf("Add PRBR: %08" LL "x_%08" LL "x\n", prbr, hwpcb);
   return i;
 }
 
@@ -665,7 +665,7 @@ void CTraceEngine::write_arglist(CAlphaCPU* c, FILE* fl, const char* a)
       value = c->get_r(r, true);
       if(!strcmp(f, "%s"))
       {
-        sprintf(op, "%"LL "x (", value);
+        sprintf(op, "%" LL "x (", value);
         while(*op)
           op++;
         value = real_address(value, c, false);
@@ -679,21 +679,21 @@ void CTraceEngine::write_arglist(CAlphaCPU* c, FILE* fl, const char* a)
         *(op) = '\0';
       }
       else if(!strcmp(f, "%c"))
-        sprintf(op, "%02"LL "x (%c)", value, printable((char) value));
+        sprintf(op, "%02" LL "x (%c)", value, printable((char) value));
       else if(!strcmp(f, "%d"))
-        sprintf(op, "%"LL "d", value);
+        sprintf(op, "%" LL "d", value);
       else if(!strcmp(f, "%x"))
-        sprintf(op, "%"LL "x", value);
+        sprintf(op, "%" LL "x", value);
       else if(!strcmp(f, "%0x"))
-        sprintf(op, "%016"LL "x", value);
+        sprintf(op, "%016" LL "x", value);
       else if(!strcmp(f, "%016x"))
-        sprintf(op, "%016"LL "x", value);
+        sprintf(op, "%016" LL "x", value);
       else if(!strcmp(f, "%08x"))
-        sprintf(op, "%08"LL "x", value);
+        sprintf(op, "%08" LL "x", value);
       else if(!strcmp(f, "%04x"))
-        sprintf(op, "%04"LL "x", value);
+        sprintf(op, "%04" LL "x", value);
       else if(!strcmp(f, "%02x"))
-        sprintf(op, "%02"LL "x", value);
+        sprintf(op, "%02" LL "x", value);
       else
         sprintf(op, f, value);
       while(*op)
@@ -738,7 +738,7 @@ void CTraceEngine::read_procfile(const char* filename)
       {
         *fn_name = '\0';
         fn_name++;
-        result = sscanf(linebuffer, "%"LL "x", &address);
+        result = sscanf(linebuffer, "%" LL "x", &address);
         if((result == 1) && address)
         {
           fn_args = strchr(fn_name, ';');
@@ -823,7 +823,7 @@ void CTraceEngine::run_script(const char* filename)
     }
     else
     {
-      printf("IDB %016"LL "x %c>", theSystem->get_cpu(0)->get_clean_pc(),
+      printf("IDB %016" LL "x %c>", theSystem->get_cpu(0)->get_clean_pc(),
              (theSystem->get_cpu(0)->get_pc() & U64(0x1)) ? 'P' : '-');
     }
 #endif
@@ -955,17 +955,17 @@ int CTraceEngine::parse(char command[100][100])
     if(!strncasecmp(command[0], "DUMPREGS", strlen(command[0])))
     {
       printf("\n==================== SYSTEM STATE =======================\n");
-      printf("PC: %"LL "x\n", theSystem->get_cpu(0)->get_pc());
-      printf("Physical PC: %"LL "x\n",
+      printf("PC: %" LL "x\n", theSystem->get_cpu(0)->get_pc());
+      printf("Physical PC: %" LL "x\n",
              theSystem->get_cpu(0)->get_current_pc_physical());
-      printf("Instruction count: %"LL "d\n",
+      printf("Instruction count: %" LL "d\n",
              theSystem->get_cpu(0)->get_instruction_count());
       printf("\n==================== REGISTER VALUES ====================\n");
       for(i = 0; i < 32; i++)
       {
         if(i < 10)
           printf("R");
-        printf("%d:%016"LL "x", i, theSystem->get_cpu(0)->get_r(i, false));
+        printf("%d:%016" LL "x", i, theSystem->get_cpu(0)->get_r(i, false));
         if(i % 4 == 3)
           printf("\n");
         else
@@ -977,7 +977,7 @@ int CTraceEngine::parse(char command[100][100])
       {
         if(i < 10)
           printf("S");
-        printf("%d:%016"LL "x", i, theSystem->get_cpu(0)->get_r(i + 32, false));
+        printf("%d:%016" LL "x", i, theSystem->get_cpu(0)->get_r(i + 32, false));
         if(i % 4 == 3)
           printf("\n");
         else
@@ -988,7 +988,7 @@ int CTraceEngine::parse(char command[100][100])
       {
         if(i < 10)
           printf("S");
-        printf("%d:%016"LL "x", i, theSystem->get_cpu(0)->get_r(i + 32, false));
+        printf("%d:%016" LL "x", i, theSystem->get_cpu(0)->get_r(i + 32, false));
         if(i % 4 == 3)
           printf("\n");
         else
@@ -1000,7 +1000,7 @@ int CTraceEngine::parse(char command[100][100])
       {
         if(i < 10)
           printf("F");
-        printf("%d:%016"LL "x", i, theSystem->get_cpu(0)->get_f(i));
+        printf("%d:%016" LL "x", i, theSystem->get_cpu(0)->get_f(i));
         if(i % 4 == 3)
           printf("\n");
         else
@@ -1444,7 +1444,7 @@ int CTraceEngine::parse(char command[100][100])
 
     if(!strncasecmp(command[0], "JUMP", strlen(command[0])))
     {
-      result = sscanf(command[1], "%"LL "x", &iJump);
+      result = sscanf(command[1], "%" LL "x", &iJump);
       if(result != 1)
       {
         printf("%%IDB-F-INVVAL: Invalid hexadecimal value.\n");
@@ -1469,7 +1469,7 @@ int CTraceEngine::parse(char command[100][100])
       if(!strcmp(command[1], "=") || !strcmp(command[1], ">")
        || !strcmp(command[1], "<"))
       {
-        result = sscanf(command[2], "%"LL "x", &iBreakPoint);
+        result = sscanf(command[2], "%" LL "x", &iBreakPoint);
         if(result != 1)
         {
           printf("%%IDB-F-INVVAL: Invalid hexadecimal value.\n");
@@ -1491,7 +1491,7 @@ int CTraceEngine::parse(char command[100][100])
         case '<': iBreakPointMode = -1; break;
         }
 
-        printf("%%IDB-I-BRKSET: Breakpoint set when PC %c %016"LL "x.\n",
+        printf("%%IDB-I-BRKSET: Breakpoint set when PC %c %016" LL "x.\n",
                command[1][0], iBreakPoint);
         bBreakPoint = true;
         return 0;
@@ -1500,7 +1500,7 @@ int CTraceEngine::parse(char command[100][100])
       {
         if(!strncasecmp(command[1], "INSTRUCTION", strlen(command[1])))
         {
-          result = sscanf(command[2], "%"LL "x", &iBreakPointInstruction);
+          result = sscanf(command[2], "%" LL "x", &iBreakPointInstruction);
           if(result != 1)
           {
             printf("%%IDB-F-INVVAL: Invalid hexadecimal value.\n");
@@ -1516,7 +1516,7 @@ int CTraceEngine::parse(char command[100][100])
         }
         else if(!strncasecmp(command[1], "ACCESS", strlen(command[1])))
         {
-          result = sscanf(command[2], "%"LL "x", &iBreakPoint);
+          result = sscanf(command[2], "%" LL "x", &iBreakPoint);
           if(result != 1)
           {
             printf("%%IDB-F-INVVAL: Invalid hexadecimal value.\n");
@@ -1524,7 +1524,7 @@ int CTraceEngine::parse(char command[100][100])
             return 0;
           }
 
-          printf("%%IDB-I-BRKSET: Breakpoint set when data is read/written at %016"LL"x.\n",
+          printf("%%IDB-I-BRKSET: Breakpoint set when data is read/written at %016" LL"x.\n",
                iBreakPoint);
           bBreakPoint = true;
           iBreakPointMode = 3;
@@ -1532,7 +1532,7 @@ int CTraceEngine::parse(char command[100][100])
         }
         else if(!strncasecmp(command[1], "READ", strlen(command[1])))
         {
-          result = sscanf(command[2], "%"LL "x", &iBreakPoint);
+          result = sscanf(command[2], "%" LL "x", &iBreakPoint);
           if(result != 1)
           {
             printf("%%IDB-F-INVVAL: Invalid hexadecimal value.\n");
@@ -1540,7 +1540,7 @@ int CTraceEngine::parse(char command[100][100])
             return 0;
           }
 
-          printf("%%IDB-I-BRKSET: Breakpoint set when data is read at %016"LL"x.\n",
+          printf("%%IDB-I-BRKSET: Breakpoint set when data is read at %016" LL"x.\n",
                iBreakPoint);
           bBreakPoint = true;
           iBreakPointMode = 4;
@@ -1548,7 +1548,7 @@ int CTraceEngine::parse(char command[100][100])
         }
         else if(!strncasecmp(command[1], "WRITE", strlen(command[1])))
         {
-          result = sscanf(command[2], "%"LL "x", &iBreakPoint);
+          result = sscanf(command[2], "%" LL "x", &iBreakPoint);
           if(result != 1)
           {
             printf("%%IDB-F-INVVAL: Invalid hexadecimal value.\n");
@@ -1556,7 +1556,7 @@ int CTraceEngine::parse(char command[100][100])
             return 0;
           }
 
-          printf("%%IDB-I-BRKSET: Breakpoint set when data is written at %016"LL"x.\n",
+          printf("%%IDB-I-BRKSET: Breakpoint set when data is written at %016" LL"x.\n",
                iBreakPoint);
           bBreakPoint = true;
           iBreakPointMode = 5;
@@ -1624,7 +1624,7 @@ int CTraceEngine::parse(char command[100][100])
         return 0;
       }
 
-      result = sscanf(command[2], "%"LL "x", &value);
+      result = sscanf(command[2], "%" LL "x", &value);
       if(result != 1)
       {
         printf("%%IDB-F-INVVAL: Invalid hexadecimal value.\n");
@@ -1646,7 +1646,7 @@ int CTraceEngine::parse(char command[100][100])
         return 0;
       }
 
-      result = sscanf(command[2], "%"LL "x", &value);
+      result = sscanf(command[2], "%" LL "x", &value);
       if(result != 1)
       {
         printf("%%IDB-F-INVVAL: Invalid hexadecimal value.\n");
@@ -1662,9 +1662,9 @@ int CTraceEngine::parse(char command[100][100])
     if(!strncasecmp(command[0], "LIST", strlen(command[0]))
      && !strcmp(command[2], "-"))
     {
-      result = sscanf(command[1], "%"LL "x", &iFrom);
+      result = sscanf(command[1], "%" LL "x", &iFrom);
       if(result == 1)
-        result = sscanf(command[3], "%"LL "x", &iTo);
+        result = sscanf(command[3], "%" LL "x", &iTo);
       if(result != 1)
       {
         printf("%%IDB-F-INVVAL: Invalid hexadecimal value.\n");
@@ -1779,7 +1779,7 @@ void CTraceEngine::list_all()
 
   while(p)
   {
-    printf("\n======== DISASSEMBLING %08"LL "x TO %08"LL "x ========\n\n",
+    printf("\n======== DISASSEMBLING %08" LL "x TO %08" LL "x ========\n\n",
            p->from, p->to);
     theSystem->get_cpu(0)->listing(p->from, p->to);
     p = p->pNext;
diff --git a/src/cpu_debug.h b/src/cpu_debug.h
index 17b3ed8..9761f41 100644
--- a/src/cpu_debug.h
+++ b/src/cpu_debug.h
@@ -185,7 +185,7 @@ void          handle_debug_string(char* s);
   {                                                                                   \
     if(bListing && !strcmp(funcname, ""))                                             \
     {                                                                                 \
-      printf("%08"LL "x: \"%s\"\n", state.current_pc,                                 \
+      printf("%08" LL "x: \"%s\"\n", state.current_pc,                                 \
              cSystem->PtrToMem(state.current_pc));                                    \
       state.pc =                                                                      \
         (                                                                             \
@@ -207,13 +207,13 @@ void          handle_debug_string(char* s);
     {                                                                                 \
       u64 xx_upto;                                                                    \
       int xx_result;                                                                  \
-      xx_result = sscanf(&(funcname[6]), "%"LL "x", &xx_upto);                        \
+      xx_result = sscanf(&(funcname[6]), "%" LL "x", &xx_upto);                        \
       if(xx_result == 1)                                                              \
       {                                                                               \
         state.pc = state.current_pc;                                                  \
         while(state.pc < xx_upto)                                                     \
         {                                                                             \
-          printf("%08"LL "x: \"%s\"\n", state.pc, cSystem->PtrToMem(state.pc));       \
+          printf("%08" LL "x: \"%s\"\n", state.pc, cSystem->PtrToMem(state.pc));       \
           state.pc += strlen(cSystem->PtrToMem(state.pc));                            \
           while(state.pc < xx_upto && cSystem->ReadMem(state.pc, 8, this) == 0)       \
             state.pc++;                                                               \
@@ -227,7 +227,7 @@ void          handle_debug_string(char* s);
       int   stringlen;                                                                \
       u64   xx_upto;                                                                  \
       int   xx_result;                                                                \
-      xx_result = sscanf(&(funcname[7]), "%"LL "x", &xx_upto);                        \
+      xx_result = sscanf(&(funcname[7]), "%" LL "x", &xx_upto);                        \
       if(xx_result == 1)                                                              \
       {                                                                               \
         state.pc = state.current_pc;                                                  \
@@ -236,7 +236,7 @@ void          handle_debug_string(char* s);
           stringlen = (int) cSystem->ReadMem(state.pc++, 8, this);                    \
           memset(stringval, 0, 300);                                                  \
           strncpy(stringval, cSystem->PtrToMem(state.pc), stringlen);                 \
-          printf("%08"LL "x: \"%s\"\n", state.pc - 1, stringval);                     \
+          printf("%08" LL "x: \"%s\"\n", state.pc - 1, stringval);                     \
           state.pc += stringlen;                                                      \
           while(state.pc < xx_upto && cSystem->ReadMem(state.pc, 8, this) == 0)       \
             state.pc++;                                                               \
@@ -254,7 +254,7 @@ void          handle_debug_string(char* s);
       || !trc->get_fnc_name(this, state.pc, &funcname)                                \
       )                                                                               \
       {                                                                               \
-        printf("%08"LL "x: %016"LL "x\n", state.pc,                                   \
+        printf("%08" LL "x: %016" LL "x\n", state.pc,                                   \
                cSystem->ReadMem(state.pc, 64, this));                                 \
         state.pc += 8;                                                                \
       }                                                                               \
@@ -270,7 +270,7 @@ void          handle_debug_string(char* s);
       || !trc->get_fnc_name(this, state.pc, &funcname)                                \
       )                                                                               \
       {                                                                               \
-        printf("%08"LL "x: %08"LL "x\n", state.pc,                                    \
+        printf("%08" LL "x: %08" LL "x\n", state.pc,                                    \
                cSystem->ReadMem(state.pc, 32, this));                                 \
         state.pc += 4;                                                                \
       }                                                                               \
@@ -287,10 +287,10 @@ void          handle_debug_string(char* s);
       dbg_strptr += strlen(dbg_strptr);                                               \
     }                                                                                 \
   }                                                                                   \
-  sprintf(dbg_strptr, bListing ? "%08"LL "x: " : "%016"LL "x", state.current_pc);     \
+  sprintf(dbg_strptr, bListing ? "%08" LL "x: " : "%016" LL "x", state.current_pc);     \
   dbg_strptr += strlen(dbg_strptr);                                                   \
   if(!bListing)                                                                       \
-    sprintf(dbg_strptr, "(%08"LL "x): ", current_pc_physical);                        \
+    sprintf(dbg_strptr, "(%08" LL "x): ", current_pc_physical);                        \
   else                                                                                \
   {                                                                                   \
     sprintf(dbg_strptr, "%08x %c%c%c%c: ", ins, printable((char) (ins)),              \
@@ -322,7 +322,7 @@ void          handle_debug_string(char* s);
   {                                           \
     if(!bListing)                             \
     {                                         \
-      sprintf(dbg_strptr, " ==> %"LL "x", a); \
+      sprintf(dbg_strptr, " ==> %" LL "x", a); \
       dbg_strptr += strlen(dbg_strptr);       \
     }                                         \
   }
@@ -349,7 +349,7 @@ void          handle_debug_string(char* s);
     if(trc->get_fnc_name(this, dbg_x, &funcname))                        \
       sprintf(dbg_strptr, "%s", funcname);                               \
     else                                                                 \
-      sprintf(dbg_strptr, "%"LL "x", dbg_x);                             \
+      sprintf(dbg_strptr, "%" LL "x", dbg_x);                             \
     dbg_strptr += strlen(dbg_strptr);                                    \
   }
 
@@ -364,11 +364,11 @@ void          handle_debug_string(char* s);
     if(trc->get_fnc_name(this, dbg_x, &funcname))                        \
       sprintf(dbg_strptr, "%s", funcname);                               \
     else                                                                 \
-      sprintf(dbg_strptr, "%"LL "x", dbg_x);                             \
+      sprintf(dbg_strptr, "%" LL "x", dbg_x);                             \
     dbg_strptr += strlen(dbg_strptr);                                    \
     if(!bListing)                                                        \
     {                                                                    \
-      sprintf(dbg_strptr, ": (%"LL "x)", state.r[REG_1]);                \
+      sprintf(dbg_strptr, ": (%" LL "x)", state.r[REG_1]);                \
       dbg_strptr += strlen(dbg_strptr);                                  \
     }                                                                    \
   }
@@ -384,11 +384,11 @@ void          handle_debug_string(char* s);
     if(trc->get_fnc_name(this, dbg_x, &funcname))                        \
       sprintf(dbg_strptr, "%s", funcname);                               \
     else                                                                 \
-      sprintf(dbg_strptr, "%"LL "x", dbg_x);                             \
+      sprintf(dbg_strptr, "%" LL "x", dbg_x);                             \
     dbg_strptr += strlen(dbg_strptr);                                    \
     if(!bListing)                                                        \
     {                                                                    \
-      sprintf(dbg_strptr, ": (%"LL "x)", state.f[FREG_1]);               \
+      sprintf(dbg_strptr, ": (%" LL "x)", state.f[FREG_1]);               \
       dbg_strptr += strlen(dbg_strptr);                                  \
     }                                                                    \
   }
@@ -404,7 +404,7 @@ void          handle_debug_string(char* s);
     if(trc->get_fnc_name(this, dbg_x, &funcname))                        \
       sprintf(dbg_strptr, "%s", funcname);                               \
     else                                                                 \
-      sprintf(dbg_strptr, "%"LL "x", dbg_x);                             \
+      sprintf(dbg_strptr, "%" LL "x", dbg_x);                             \
     dbg_strptr += strlen(dbg_strptr);                                    \
   }
 
@@ -424,7 +424,7 @@ void          handle_debug_string(char* s);
     dbg_strptr += strlen(dbg_strptr);                                             \
     if(!bListing)                                                                 \
     {                                                                             \
-      sprintf(dbg_strptr, ": (%"LL "x)", state.r[REG_2]);                         \
+      sprintf(dbg_strptr, ": (%" LL "x)", state.r[REG_2]);                         \
       dbg_strptr += strlen(dbg_strptr);                                           \
     }                                                                             \
   }
@@ -445,7 +445,7 @@ void          handle_debug_string(char* s);
     dbg_strptr += strlen(dbg_strptr);                            \
     if(!bListing)                                                \
     {                                                            \
-      sprintf(dbg_strptr, ": (%"LL "x)", state.r[REG_2]);        \
+      sprintf(dbg_strptr, ": (%" LL "x)", state.r[REG_2]);        \
       dbg_strptr += strlen(dbg_strptr);                          \
     }                                                            \
   }
@@ -491,7 +491,7 @@ void          handle_debug_string(char* s);
     dbg_strptr += strlen(dbg_strptr);                                            \
     if(!bListing)                                                                \
     {                                                                            \
-      sprintf(dbg_strptr, ": (%"LL "x)", state.r[REG_2]);                        \
+      sprintf(dbg_strptr, ": (%" LL "x)", state.r[REG_2]);                        \
       dbg_strptr += strlen(dbg_strptr);                                          \
     }                                                                            \
   }
@@ -513,7 +513,7 @@ void          handle_debug_string(char* s);
     dbg_strptr += strlen(dbg_strptr);                                  \
     if(!bListing)                                                      \
     {                                                                  \
-      sprintf(dbg_strptr, ": (%"LL "x,%"LL "x)", state.r[REG_1], V_2); \
+      sprintf(dbg_strptr, ": (%" LL "x,%" LL "x)", state.r[REG_1], V_2); \
       dbg_strptr += strlen(dbg_strptr);                                \
     }                                                                  \
   }
@@ -531,7 +531,7 @@ void          handle_debug_string(char* s);
     dbg_strptr += strlen(dbg_strptr);                                        \
     if(!bListing)                                                            \
     {                                                                        \
-      sprintf(dbg_strptr, ": (%"LL "x,%"LL "x)", state.f[FREG_1],            \
+      sprintf(dbg_strptr, ": (%" LL "x,%" LL "x)", state.f[FREG_1],            \
               state.f[FREG_2]);                                              \
       dbg_strptr += strlen(dbg_strptr);                                      \
     }                                                                        \
@@ -549,7 +549,7 @@ void          handle_debug_string(char* s);
     dbg_strptr += strlen(dbg_strptr);                                \
     if(!bListing)                                                    \
     {                                                                \
-      sprintf(dbg_strptr, ": (%"LL "x)", state.r[REG_1]);            \
+      sprintf(dbg_strptr, ": (%" LL "x)", state.r[REG_1]);            \
       dbg_strptr += strlen(dbg_strptr);                              \
     }                                                                \
   }
@@ -564,7 +564,7 @@ void          handle_debug_string(char* s);
     dbg_strptr += strlen(dbg_strptr);                                \
     if(!bListing)                                                    \
     {                                                                \
-      sprintf(dbg_strptr, ": (%"LL "x)", state.f[FREG_1]);           \
+      sprintf(dbg_strptr, ": (%" LL "x)", state.f[FREG_1]);           \
       dbg_strptr += strlen(dbg_strptr);                              \
     }                                                                \
   }
@@ -596,7 +596,7 @@ void          handle_debug_string(char* s);
     dbg_strptr += strlen(dbg_strptr);          \
     if(!bListing)                              \
     {                                          \
-      sprintf(dbg_strptr, ": (%"LL "x)", V_2); \
+      sprintf(dbg_strptr, ": (%" LL "x)", V_2); \
       dbg_strptr += strlen(dbg_strptr);        \
     }                                          \
   }
@@ -643,7 +643,7 @@ void          handle_debug_string(char* s);
     dbg_strptr += strlen(dbg_strptr);                                               \
     if(!bListing)                                                                   \
     {                                                                               \
-      sprintf(dbg_strptr, ": (%"LL "x)", state.r[REG_2]);                           \
+      sprintf(dbg_strptr, ": (%" LL "x)", state.r[REG_2]);                           \
       dbg_strptr += strlen(dbg_strptr);                                             \
     }                                                                               \
   }
@@ -667,7 +667,7 @@ void          handle_debug_string(char* s);
     dbg_strptr += strlen(dbg_strptr);                                               \
     if(!bListing)                                                                   \
     {                                                                               \
-      sprintf(dbg_strptr, ": (%"LL "x)", state.r[REG_2]);                           \
+      sprintf(dbg_strptr, ": (%" LL "x)", state.r[REG_2]);                           \
       dbg_strptr += strlen(dbg_strptr);                                             \
     }                                                                               \
   }
@@ -684,7 +684,7 @@ void          handle_debug_string(char* s);
     dbg_strptr += strlen(dbg_strptr);                                        \
     if(!bListing)                                                            \
     {                                                                        \
-      sprintf(dbg_strptr, ": (%"LL "x)", state.r[REG_2]);                    \
+      sprintf(dbg_strptr, ": (%" LL "x)", state.r[REG_2]);                    \
       dbg_strptr += strlen(dbg_strptr);                                      \
     }                                                                        \
   }
@@ -703,7 +703,7 @@ void          handle_debug_string(char* s);
     dbg_strptr += strlen(dbg_strptr);                           \
     if(!bListing)                                               \
     {                                                           \
-      sprintf(dbg_strptr, ": (%"LL "x)", state.f[FREG_2]);      \
+      sprintf(dbg_strptr, ": (%" LL "x)", state.f[FREG_2]);      \
       dbg_strptr += strlen(dbg_strptr);                         \
     }                                                           \
   }
-- 
2.45.2

Places

File 0007-C-11-requires-a-space-between-literal-and-string-mac.patch of Package es40 (Revision 99dcf900cbd188ff51782ca811d99f3d)

Places