christoph/fail
1
Fork 0
Code Releases Activity

Debian 10: switch to C++14

Browse Source 
Some libraries, e.g. protobuf, depend on C++11 now.  As they are
(indirectly) included in some .ah aspect headers, everything has to be
compiled with C++11 enabled now.

This change switches to C++14 globally.

Change-Id: I56a802bd510704d668a2b2c8957e11725fbe98b7
This commit is contained in:
Horst Schirmeier
2019-10-21 17:07:09 +02:00
committed by Horst Schirmeier
parent 924e234db1
commit 8d060ef375
12 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
simulators/bochs/bx_debug/dbg_main.cc
View File

@ -908,11 +908,11 @@ void bx_dbg_info_segment_regs_command(void)
(unsigned) sreg.des_l, (unsigned) sreg.valid);
BX_CPU(dbg_cpu)->dbg_get_gdtr(&global_sreg);
dbg_printf("gdtr:base=0x"FMT_ADDRX", limit=0x%x\n",
dbg_printf("gdtr:base=0x" FMT_ADDRX ", limit=0x%x\n",
global_sreg.base, (unsigned) global_sreg.limit);
BX_CPU(dbg_cpu)->dbg_get_idtr(&global_sreg);
dbg_printf("idtr:base=0x"FMT_ADDRX", limit=0x%x\n",
dbg_printf("idtr:base=0x" FMT_ADDRX ", limit=0x%x\n",
global_sreg.base, (unsigned) global_sreg.limit);
}
@ -1610,18 +1610,18 @@ void bx_dbg_print_watchpoints(void)
// print watch point info
for (i = 0; i < num_read_watchpoints; i++) {
if (BX_MEM(0)->dbg_fetch_mem(BX_CPU(dbg_cpu), read_watchpoint[i].addr, 2, buf))
dbg_printf("rd 0x"FMT_PHY_ADDRX" len=%d\t\t(%04x)\n",
dbg_printf("rd 0x" FMT_PHY_ADDRX " len=%d\t\t(%04x)\n",
read_watchpoint[i].addr, read_watchpoint[i].len, (int)buf[0] | ((int)buf[1] << 8));
else
dbg_printf("rd 0x"FMT_PHY_ADDRX" len=%d\t\t(read error)\n",
dbg_printf("rd 0x" FMT_PHY_ADDRX " len=%d\t\t(read error)\n",
read_watchpoint[i].addr, read_watchpoint[i].len);
}
for (i = 0; i < num_write_watchpoints; i++) {
if (BX_MEM(0)->dbg_fetch_mem(BX_CPU(dbg_cpu), write_watchpoint[i].addr, 2, buf))
dbg_printf("wr 0x"FMT_PHY_ADDRX" len=%d\t\t(%04x)\n",
dbg_printf("wr 0x" FMT_PHY_ADDRX " len=%d\t\t(%04x)\n",
write_watchpoint[i].addr, write_watchpoint[i].len, (int)buf[0] | ((int)buf[1] << 8));
else
dbg_printf("rd 0x"FMT_PHY_ADDRX" len=%d\t\t(read error)\n",
dbg_printf("rd 0x" FMT_PHY_ADDRX " len=%d\t\t(read error)\n",
write_watchpoint[i].addr, write_watchpoint[i].len);
}
}
@ -1861,7 +1861,7 @@ void bx_dbg_disassemble_current(int which_cpu, int print_time)
dbg_printf("(%u) ", which_cpu);
if (BX_CPU(which_cpu)->protected_mode()) {
dbg_printf("[0x"FMT_PHY_ADDRX"] %04x:" FMT_ADDRX " (%s): ",
dbg_printf("[0x" FMT_PHY_ADDRX "] %04x:" FMT_ADDRX " (%s): ",
phy, BX_CPU(which_cpu)->guard_found.cs,
BX_CPU(which_cpu)->guard_found.eip,
bx_dbg_symbolic_address(BX_CPU(which_cpu)->cr3 >> 12,
@ -1869,7 +1869,7 @@ void bx_dbg_disassemble_current(int which_cpu, int print_time)
BX_CPU(which_cpu)->get_segment_base(BX_SEG_REG_CS)));
}
else { // Real & V86 mode
dbg_printf("[0x"FMT_PHY_ADDRX"] %04x:%04x (%s): ",
dbg_printf("[0x" FMT_PHY_ADDRX "] %04x:%04x (%s): ",
phy, BX_CPU(which_cpu)->guard_found.cs,
(unsigned) BX_CPU(which_cpu)->guard_found.eip,
bx_dbg_symbolic_address_16bit(BX_CPU(which_cpu)->guard_found.eip,
@ -2250,7 +2250,7 @@ void bx_dbg_info_bpoints_command(void)
dbg_printf("pbreakpoint ");
dbg_printf("keep ");
dbg_printf(bx_guard.iaddr.phy[i].enabled?"y ":"n ");
dbg_printf("0x"FMT_PHY_ADDRX"\n", bx_guard.iaddr.phy[i].addr);
dbg_printf("0x" FMT_PHY_ADDRX "\n", bx_guard.iaddr.phy[i].addr);
}
#endif
}
@ -2973,7 +2973,7 @@ void bx_dbg_print_descriptor64(Bit32u lo1, Bit32u hi1, Bit32u lo2, Bit32u hi2)
break;
default:
// task, int, trap, or call gate.
dbg_printf("target=0x%04x:"FMT_ADDRX", DPL=%d", segment, offset, dpl);
dbg_printf("target=0x%04x:" FMT_ADDRX ", DPL=%d", segment, offset, dpl);
break;
}
}
@ -3464,7 +3464,7 @@ void bx_dbg_dump_table(void)
return;
}
printf("cr3: 0x"FMT_PHY_ADDRX"\n", BX_CPU(dbg_cpu)->cr3);
printf("cr3: 0x" FMT_PHY_ADDRX "\n", BX_CPU(dbg_cpu)->cr3);
lin = 0;
phy = 0;
@ -3476,14 +3476,14 @@ void bx_dbg_dump_table(void)
if(valid) {
if((lin - start_lin) != (phy - start_phy)) {
if(start_lin != 1)
dbg_printf("0x%08x-0x%08x -> 0x"FMT_PHY_ADDRX"-0x"FMT_PHY_ADDRX"\n",
dbg_printf("0x%08x-0x%08x -> 0x" FMT_PHY_ADDRX "-0x" FMT_PHY_ADDRX "\n",
start_lin, lin - 1, start_phy, start_phy + (lin-1-start_lin));
start_lin = lin;
start_phy = phy;
}
} else {
if(start_lin != 1)
dbg_printf("0x%08x-0x%08x -> 0x"FMT_PHY_ADDRX"-0x"FMT_PHY_ADDRX"\n",
dbg_printf("0x%08x-0x%08x -> 0x" FMT_PHY_ADDRX "-0x" FMT_PHY_ADDRX "\n",
start_lin, lin - 1, start_phy, start_phy + (lin-1-start_lin));
start_lin = 1;
start_phy = 2;
@ -3493,7 +3493,7 @@ void bx_dbg_dump_table(void)
lin += 0x1000;
}
if(start_lin != 1)
dbg_printf("0x%08x-0x%08x -> 0x"FMT_PHY_ADDRX"-0x"FMT_PHY_ADDRX"\n",
dbg_printf("0x%08x-0x%08x -> 0x" FMT_PHY_ADDRX "-0x" FMT_PHY_ADDRX "\n",
start_lin, 0xffffffff, start_phy, start_phy + (0xffffffff-start_lin));
}