1 diff --git a/sim/ucsim/s51.src/uc51.cc b/sim/ucsim/s51.src/uc51.cc
2 index 1bb4eb6..669a349 100644
3 --- a/sim/ucsim/s51.src/uc51.cc
4 +++ b/sim/ucsim/s51.src/uc51.cc
5 @@ -332,24 +332,24 @@ cl_51core::disass(t_addr addr, const char *sep)
8 case 'A': // absolute address
9 - sprintf(temp, "%04"_A_"x",
10 + sprintf(temp, "%04x",
12 (((code>>5)&0x07)*256 +
15 case 'l': // long address
16 - sprintf(temp, "%04"_A_"x",
17 + sprintf(temp, "%04x",
18 t_addr(rom->get(addr+1)*256 +
21 case 'a': // addr8 (direct address) at 2nd byte
22 if (!get_name(rom->get(addr+1), sfr_tbl(), temp))
23 - sprintf(temp, "%02"_M_"x", rom->get(addr+1));
24 + sprintf(temp, "%02x", rom->get(addr+1));
26 case '8': // addr8 (direct address) at 3rd byte
27 if (!get_name(rom->get(addr+2), sfr_tbl(), temp))
28 - sprintf(temp, "%02"_M_"x", rom->get(addr+2));
29 - //sprintf(temp, "%02"_M_"x", rom->get(addr+2));
30 + sprintf(temp, "%02x", rom->get(addr+2));
31 + //sprintf(temp, "%02x", rom->get(addr+2));
33 case 'b': // bitaddr at 2nd byte
35 @@ -359,30 +359,30 @@ cl_51core::disass(t_addr addr, const char *sep)
36 if (get_name((ba<128)?((ba/8)+32):(ba&0xf8), sfr_tbl(), temp))
39 - sprintf(c, "%1"_M_"d", ba & 0x07);
40 + sprintf(c, "%1d", ba & 0x07);
44 - sprintf(temp, "%02x.%"_M_"d", (ba<128)?((ba/8)+32):(ba&0xf8),
45 + sprintf(temp, "%02x.%d", (ba<128)?((ba/8)+32):(ba&0xf8),
49 case 'r': // rel8 address at 2nd byte
50 - sprintf(temp, "%04"_A_"x",
51 + sprintf(temp, "%04x",
52 t_addr(addr+2+(signed char)(rom->get(addr+1))));
54 case 'R': // rel8 address at 3rd byte
55 - sprintf(temp, "%04"_A_"x",
56 + sprintf(temp, "%04x",
57 t_addr(addr+3+(signed char)(rom->get(addr+2))));
59 case 'd': // data8 at 2nd byte
60 - sprintf(temp, "%02"_M_"x", rom->get(addr+1));
61 + sprintf(temp, "%02x", rom->get(addr+1));
63 case 'D': // data8 at 3rd byte
64 - sprintf(temp, "%02"_M_"x", rom->get(addr+2));
65 + sprintf(temp, "%02x", rom->get(addr+2));
67 case '6': // data16 at 2nd(H)-3rd(L) byte
68 - sprintf(temp, "%04"_A_"x",
69 + sprintf(temp, "%04x",
70 t_addr(rom->get(addr+1)*256 +
73 diff --git a/sim/ucsim/s51.src/uc390.cc b/sim/ucsim/s51.src/uc390.cc
74 index a81420d..0a70996 100644
75 --- a/sim/ucsim/s51.src/uc390.cc
76 +++ b/sim/ucsim/s51.src/uc390.cc
77 @@ -1123,11 +1123,11 @@ cl_uc390::disass (t_addr addr, const char *sep)
79 case 'a': // addr8 (direct address) at 2nd byte
80 if (!get_name (rom->get (addr + 1), sfr_tbl (), temp))
81 - sprintf (temp, "%02"_M_"x", rom->get (addr + 1));
82 + sprintf (temp, "%02x", rom->get (addr + 1));
84 case '8': // addr8 (direct address) at 3rd byte
85 if (!get_name (rom->get (addr + 2), sfr_tbl (), temp))
86 - sprintf (temp, "%02"_M_"x", rom->get (addr + 2));
87 + sprintf (temp, "%02x", rom->get (addr + 2));
89 case 'b': // bitaddr at 2nd byte
91 @@ -1137,27 +1137,27 @@ cl_uc390::disass (t_addr addr, const char *sep)
92 if (get_name ((ba<128) ? ((ba/8)+32) : (ba&0xf8), sfr_tbl(), temp))
95 - sprintf (c, "%1"_M_"d", ba & 0x07);
96 + sprintf (c, "%1d", ba & 0x07);
100 - sprintf (temp, "%02x.%"_M_"d", (ba<128) ? ((ba/8)+32) : (ba&0xf8),
101 + sprintf (temp, "%02x.%d", (ba<128) ? ((ba/8)+32) : (ba&0xf8),
105 case 'r': // rel8 address at 2nd byte
106 - sprintf (temp, "%04"_A_"x",
107 + sprintf (temp, "%04x",
108 t_addr (addr + 2 + (signed char) (rom->get (addr + 1))));
110 case 'R': // rel8 address at 3rd byte
111 - sprintf (temp, "%04"_A_"x",
112 + sprintf (temp, "%04x",
113 t_addr (addr + 3 + (signed char) (rom->get (addr + 2))));
115 case 'd': // data8 at 2nd byte
116 - sprintf (temp, "%02"_M_"x", rom->get (addr + 1));
117 + sprintf (temp, "%02x", rom->get (addr + 1));
119 case 'D': // data8 at 3rd byte
120 - sprintf (temp, "%02"_M_"x", rom->get (addr + 2));
121 + sprintf (temp, "%02x", rom->get (addr + 2));
125 diff --git a/sim/ucsim/avr.src/avr.cc b/sim/ucsim/avr.src/avr.cc
126 index 3b021e5..efa56f4 100644
127 --- a/sim/ucsim/avr.src/avr.cc
128 +++ b/sim/ucsim/avr.src/avr.cc
129 @@ -265,7 +265,7 @@ cl_avr::disass(t_addr addr, const char *sep)
133 - sprintf(temp, "0x%06"_A_"x",
134 + sprintf(temp, "0x%06x",
135 rom->validate_address(k+1+(signed int)addr));
138 diff --git a/sim/ucsim/cmd.src/set.cc b/sim/ucsim/cmd.src/set.cc
139 index dc5cbb7..fe9562e 100644
140 --- a/sim/ucsim/cmd.src/set.cc
141 +++ b/sim/ucsim/cmd.src/set.cc
142 @@ -69,7 +69,7 @@ COMMAND_DO_WORK_UC(cl_set_mem_cmd)
144 con->dd_printf("Error: no data\n");
145 else if (start < mem->get_start_address())
146 - con->dd_printf("Start address less then 0x%"_A_"x\n",
147 + con->dd_printf("Start address less then 0x%x\n",
148 mem->get_start_address());
151 diff --git a/sim/ucsim/sim.src/stack.cc b/sim/ucsim/sim.src/stack.cc
152 index 60e13ad..d0bb443 100644
153 --- a/sim/ucsim/sim.src/stack.cc
154 +++ b/sim/ucsim/sim.src/stack.cc
155 @@ -70,7 +70,7 @@ cl_stack_op::info_head(class cl_console_base *con)
157 cl_stack_op::info(class cl_console_base *con, class cl_uc *uc)
159 - con->dd_printf("%-4s 0x%06"_A_"x-0x%06"_A_"x %d ",
160 + con->dd_printf("%-4s 0x%06x-0x%06x %d ",
161 get_op_name(), SP_before, SP_after, abs(SP_before-SP_after));
164 @@ -166,7 +166,7 @@ cl_stack_call::get_op_name(void)
166 cl_stack_call::print_info(class cl_console_base *con)
168 - con->dd_printf("0x%06"_A_"x", called_addr);
169 + con->dd_printf("0x%06x", called_addr);
173 @@ -217,7 +217,7 @@ cl_stack_intr::get_op_name(void)
175 cl_stack_intr::print_info(class cl_console_base *con)
177 - con->dd_printf("0x%06"_A_"x", called_addr);
178 + con->dd_printf("0x%06x", called_addr);
182 @@ -279,7 +279,7 @@ void
183 cl_stack_push::print_info(class cl_console_base *con)
186 - con->dd_printf("0x%06"_A_"x", d);
187 + con->dd_printf("0x%06x", d);
191 @@ -468,8 +468,8 @@ cl_error_stack_tracker_empty::~cl_error_stack_tracker_empty(void)
193 cl_error_stack_tracker_empty::print(class cl_commander_base *c)
195 - c->dd_printf("%s(0x%06"_A_"x: %s on empty stack, PC="
196 - "0x06"_A_"x, SP=0x%06"_A_"x->0x%06"_A_"x\n",
197 + c->dd_printf("%s(0x%06x: %s on empty stack, PC="
198 + "0x06x, SP=0x%06x->0x%06x\n",
199 get_type_name(), operation->get_pc(), operation->get_op_name(),
200 operation->get_before(), operation->get_after());
202 @@ -494,8 +494,8 @@ cl_error_stack_tracker_unmatch::~cl_error_stack_tracker_unmatch(void)
204 cl_error_stack_tracker_unmatch::print(class cl_commander_base *c)
206 - c->dd_printf("%s(0x%06"_A_"x): %s when %s expected, "
207 - "SP=0x%06"_A_"x->0x%06"_A_"x\n",
208 + c->dd_printf("%s(0x%06x): %s when %s expected, "
209 + "SP=0x%06x->0x%06x\n",
210 get_type_name(), operation->get_pc(),
211 operation->get_op_name(), top->get_matching_name(),
212 operation->get_before(), operation->get_after());
213 @@ -520,7 +520,7 @@ cl_error_stack_tracker_inconsistent::~cl_error_stack_tracker_inconsistent(void)
215 cl_error_stack_tracker_inconsistent::print(class cl_commander_base *c)
217 - c->dd_printf("%s(0x%06"_A_"x): %d byte(s) unread from the stack\n",
218 + c->dd_printf("%s(0x%06x): %d byte(s) unread from the stack\n",
219 get_type_name(), operation->get_pc(),
222 diff --git a/sim/ucsim/sim.src/sim.cc b/sim/ucsim/sim.src/sim.cc
223 index 248ca31..7e4ca80 100644
224 --- a/sim/ucsim/sim.src/sim.cc
225 +++ b/sim/ucsim/sim.src/sim.cc
226 @@ -225,7 +225,7 @@ cl_sim::stop(class cl_ev_brk *brk)
227 cmd->frozen_console->read_line();
229 //con->dd_printf("Stop at 0x%06x\n", uc->PC);
230 - con->dd_printf("Event `%s' at %s[0x%"_A_"x]: 0x%"_A_"x %s\n",
231 + con->dd_printf("Event `%s' at %s[0x%x]: 0x%x %s\n",
232 brk->id, brk->get_mem()->get_name(), brk->addr,
234 uc->disass(uc->instPC, " "));
235 diff --git a/sim/ucsim/sim.src/brk.cc b/sim/ucsim/sim.src/brk.cc
236 index 12b87d6..59c87b7 100644
237 --- a/sim/ucsim/sim.src/brk.cc
238 +++ b/sim/ucsim/sim.src/brk.cc
239 @@ -240,7 +240,7 @@ brk_coll::del_bp(t_addr addr)
243 - fprintf(stderr, "brk_coll::del_bp(0x%"_A_"x\n", addr);//FIXME
244 + fprintf(stderr, "brk_coll::del_bp(0x%x\n", addr);//FIXME
245 //rom->bp_map->clear(addr);
248 diff --git a/sim/ucsim/sim.src/obsolete.cc b/sim/ucsim/sim.src/obsolete.cc
249 index ef9a2c1..3195a54 100644
250 --- a/sim/ucsim/sim.src/obsolete.cc
251 +++ b/sim/ucsim/sim.src/obsolete.cc
252 @@ -233,7 +233,7 @@ cl_mem::read(t_addr addr)
256 - fprintf(stderr, "Address 0x%06"_A_"x is over 0x%06"_A_"x\n", addr, size);
257 + fprintf(stderr, "Address 0x%06x is over 0x%06x\n", addr, size);
260 /*if ((loc= read_locs->get_loc(addr)))
261 @@ -281,7 +281,7 @@ cl_mem::write(t_addr addr, t_mem val)
262 ((TYPE_UWORD*)mem)[addr]= (*val)&mask;
264 ((TYPE_UDWORD*)mem)[addr]= (*val)&mask;*/
265 - fprintf(stderr, "FIXME cl_mem::write(0x%06"_A_"x, 0x%04"_M_"x)\n",
266 + fprintf(stderr, "FIXME cl_mem::write(0x%06x, 0x%04x)\n",
270 diff --git a/sim/ucsim/sim.src/test_mem_speed.cc b/sim/ucsim/sim.src/test_mem_speed.cc
271 index 8290b93..0533508 100644
272 --- a/sim/ucsim/sim.src/test_mem_speed.cc
273 +++ b/sim/ucsim/sim.src/test_mem_speed.cc
274 @@ -54,7 +54,7 @@ do_rw_test(class cl_mem *mem, int time)
275 d2= mem->write(a, d2);
278 - printf("%"_M_"d written to mem and %"_M_"d read back!\n", d2, d);
279 + printf("%d written to mem and %d read back!\n", d2, d);
283 diff --git a/sim/ucsim/sim.src/uc.cc b/sim/ucsim/sim.src/uc.cc
284 index 2361bf4..f7d4a57 100644
285 --- a/sim/ucsim/sim.src/uc.cc
286 +++ b/sim/ucsim/sim.src/uc.cc
287 @@ -1605,7 +1605,7 @@ cl_uc::stack_write(class cl_stack_op *op)
289 class cl_error_stack_tracker_wrong_handle *e= new
290 cl_error_stack_tracker_wrong_handle(DD_FALSE);
291 - //fprintf(stderr, "%06"_A_"x cl_uc::stack_read() should be called for "
292 + //fprintf(stderr, "%06x cl_uc::stack_read() should be called for "
293 //"%s\n", op->get_pc(), op->get_op_name());
296 @@ -1625,14 +1625,14 @@ cl_uc::stack_read(class cl_stack_op *op)
297 cl_error_stack_tracker_wrong_handle(DD_TRUE);
300 - //fprintf(stderr, "%06"_A_"x cl_uc::stack_write() should be called for "
301 + //fprintf(stderr, "%06x cl_uc::stack_write() should be called for "
302 //"%s\n", op->get_pc(), op->get_op_name());
307 class cl_error *e= new cl_error_stack_tracker_empty(op);
308 - /*printf("0x%06"_A_"x %s operation on stack but no operation was before\n
309 + /*printf("0x%06x %s operation on stack but no operation was before\n
311 op->get_pc(), op->get_op_name());*/
313 @@ -1647,13 +1647,13 @@ cl_uc::stack_read(class cl_stack_op *op)
314 class cl_error *e= new cl_error_stack_tracker_unmatch(top, op);
317 - /*printf("0x%06"_A_"x %s operation on stack but last was %s\n",
318 + /*printf("0x%06x %s operation on stack but last was %s\n",
319 op->get_pc(), op->get_op_name(), top->get_op_name());*/
321 int top_size= top->data_size(), op_size= op->data_size();
322 if (top_size != op_size)
324 - application->debug("0x%06"_A_"x %d bytes to read out of stack "
325 + application->debug("0x%06x %d bytes to read out of stack "
326 "but %d was pushed in last operation\n",
327 op->get_pc(), op_size, top_size);
329 @@ -1670,9 +1670,9 @@ cl_uc::stack_read(class cl_stack_op *op)
333 - application->debug("0x%06"_A_"x %d ops removed from stack-tracker "
334 - "when %s happened, top pc=0x%06"_A_"x "
335 - "top before=0x%06"_A_"x op after=0x%06"_A_"x\n",
336 + application->debug("0x%06x %d ops removed from stack-tracker "
337 + "when %s happened, top pc=0x%06x "
338 + "top before=0x%06x op after=0x%06x\n",
339 op->get_pc(), removed, op->get_op_name(),
340 top?(top->get_pc()):0, top?(top->get_before()):0,
342 @@ -1683,9 +1683,9 @@ cl_uc::stack_read(class cl_stack_op *op)
343 int ta= top->get_after(), oa= op->get_after();
346 - application->debug("0x%06"_A_"x stack still inconsistent after %s, "
347 + application->debug("0x%06x stack still inconsistent after %s, "
348 "%d byte(s) should be read out; top after"
349 - "=0x%06"_A_"x op after=0x%06"_A_"x\n",
350 + "=0x%06x op after=0x%06x\n",
351 op->get_pc(), op->get_op_name(), abs(ta-oa),