git.gag.com Git - debian/cc1111/blob - debian/patches/build-with-gcc-8.patch

   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)
   6            switch (*(b++))
   7              {
   8              case 'A': // absolute address
   9 -              sprintf(temp, "%04"_A_"x",
  10 +              sprintf(temp, "%04x",
  11                        t_addr((addr&0xf800)|
  12                               (((code>>5)&0x07)*256 +
  13                                rom->get(addr+1))));
  14                break;
  15              case 'l': // long address
  16 -              sprintf(temp, "%04"_A_"x",
  17 +              sprintf(temp, "%04x",
  18                        t_addr(rom->get(addr+1)*256 +
  19                               rom->get(addr+2)));
  20                break;
  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));
  25                break;
  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));
  32                break;
  33              case 'b': // bitaddr at 2nd byte
  34                {
  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))
  37                    {
  38                      strcat(temp, ".");
  39 -                    sprintf(c, "%1"_M_"d", ba & 0x07);
  40 +                    sprintf(c, "%1d", ba & 0x07);
  41                      strcat(temp, c);
  42                      break;
  43                    }
  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),
  46                          ba & 0x07);
  47                  break;
  48                }
  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))));
  53                break;
  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))));
  58                break;
  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));
  62                break;
  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));
  66                break;
  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 +
  71                               rom->get(addr+2)));
  72                break;
  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)
  78                break;
  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));
  83                break;
  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));
  88                break;
  89              case 'b': // bitaddr at 2nd byte
  90                {
  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))
  93                    {
  94                      strcat (temp, ".");
  95 -                    sprintf (c, "%1"_M_"d", ba & 0x07);
  96 +                    sprintf (c, "%1d", ba & 0x07);
  97                      strcat (temp, c);
  98                      break;
  99                    }
 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),
 102                           ba & 0x07);
 103                  break;
 104                }
 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))));
 109                break;
 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))));
 114                break;
 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));
 118                break;
 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));
 122                break;
 123              default:
 124                strcpy (temp, "?");
 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)
 130                  int k= code&0xfff;
 131                  if (code&0x800)
 132                    k|= -4096;
 133 -                sprintf(temp, "0x%06"_A_"x",
 134 +                sprintf(temp, "0x%06x",
 135                          rom->validate_address(k+1+(signed int)addr));
 136                  break;
 137                }
 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)
 143      if (len == 0)
 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());
 149      else
 150        {
 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)
 156  void
 157  cl_stack_op::info(class cl_console_base *con, class cl_uc *uc)
 158  {
 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));
 162    print_info(con);
 163    con->dd_printf(" ");
 164 @@ -166,7 +166,7 @@ cl_stack_call::get_op_name(void)
 165  void
 166  cl_stack_call::print_info(class cl_console_base *con)
 167  {
 168 -  con->dd_printf("0x%06"_A_"x", called_addr);
 169 +  con->dd_printf("0x%06x", called_addr);
 170  }
 171
 172  const char *
 173 @@ -217,7 +217,7 @@ cl_stack_intr::get_op_name(void)
 174  void
 175  cl_stack_intr::print_info(class cl_console_base *con)
 176  {
 177 -  con->dd_printf("0x%06"_A_"x", called_addr);
 178 +  con->dd_printf("0x%06x", called_addr);
 179  }
 180
 181  const char *
 182 @@ -279,7 +279,7 @@ void
 183  cl_stack_push::print_info(class cl_console_base *con)
 184  {
 185    t_addr d= data;
 186 -  con->dd_printf("0x%06"_A_"x", d);
 187 +  con->dd_printf("0x%06x", d);
 188  }
 189
 190  int
 191 @@ -468,8 +468,8 @@ cl_error_stack_tracker_empty::~cl_error_stack_tracker_empty(void)
 192  void
 193  cl_error_stack_tracker_empty::print(class cl_commander_base *c)
 194  {
 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());
 201  }
 202 @@ -494,8 +494,8 @@ cl_error_stack_tracker_unmatch::~cl_error_stack_tracker_unmatch(void)
 203  void
 204  cl_error_stack_tracker_unmatch::print(class cl_commander_base *c)
 205  {
 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)
 214  void
 215  cl_error_stack_tracker_inconsistent::print(class cl_commander_base *c)
 216  {
 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(),
 220                 unread_data_size);
 221  }
 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();
 228        */
 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,
 233                       uc->instPC,
 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)
 240    /*if (rom &&
 241        addr < rom->size)
 242      {
 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);
 246        }*/
 247  }
 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)
 253    if (addr >= size)
 254      {
 255        //FIXME
 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);
 258        return(0);
 259      }
 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;
 263    else
 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",
 267            addr, val);
 268    return(0);
 269  }
 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);
 276              d= mem->read(a);
 277              if (d != 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);
 280              counter+= 1;
 281            }
 282        }
 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)
 288      {
 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());
 294        e->init();
 295        error(e);
 296 @@ -1625,14 +1625,14 @@ cl_uc::stack_read(class cl_stack_op *op)
 297          cl_error_stack_tracker_wrong_handle(DD_TRUE);
 298        e->init();
 299        error(e);
 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());
 303        return;
 304      }
 305    if (!top)
 306      {
 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
 310          ",
 311          op->get_pc(), op->get_op_name());*/
 312        e->init();
 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);
 315            e->init();
 316            error(e);
 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());*/
 320          }
 321        int top_size= top->data_size(), op_size= op->data_size();
 322        if (top_size != op_size)
 323          {
 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);
 328          }
 329 @@ -1670,9 +1670,9 @@ cl_uc::stack_read(class cl_stack_op *op)
 330      }
 331    if (removed != 1)
 332      {
 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,
 341                           op->get_after());
 342 @@ -1683,9 +1683,9 @@ cl_uc::stack_read(class cl_stack_op *op)
 343        int ta= top->get_after(), oa= op->get_after();
 344        if (ta != oa)
 345          {
 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),
 352                               ta, oa);
 353            class cl_error *e=