Avoid a couple of warnings. (PR #1180)
This commit is contained in:
parent
b0220169b8
commit
fb11c74d62
|
@ -728,7 +728,9 @@ void CpuSetupBenchmark ()
|
||||||
if ((++opcode >= BENCHOPCODES) || ((addr & 0x0F) >= 0x0B))
|
if ((++opcode >= BENCHOPCODES) || ((addr & 0x0F) >= 0x0B))
|
||||||
{
|
{
|
||||||
*(mem+addr++) = 0x4C;
|
*(mem+addr++) = 0x4C;
|
||||||
*(mem+addr++) = (opcode >= BENCHOPCODES) ? 0x00 : ((addr >> 4)+1) << 4;
|
// split in 2 lines to avoid -Wunsequenced and undefined behvaiour
|
||||||
|
const BYTE value = (opcode >= BENCHOPCODES) ? 0x00 : ((addr >> 4)+1) << 4;
|
||||||
|
*(mem+addr++) = value;
|
||||||
*(mem+addr++) = 0x03;
|
*(mem+addr++) = 0x03;
|
||||||
while (addr & 0x0F)
|
while (addr & 0x0F)
|
||||||
++addr;
|
++addr;
|
||||||
|
|
|
@ -542,7 +542,7 @@ int ParseSymbolTable(const std::string & pPathFileName, SymbolTable_Index_e eSym
|
||||||
{
|
{
|
||||||
bool bFileDisplayed = false;
|
bool bFileDisplayed = false;
|
||||||
|
|
||||||
const int nMaxLen = MIN(DISASM_DISPLAY_MAX_TARGET_LEN, MAX_SYMBOLS_LEN);
|
const int nMaxLen = std::min<int>(DISASM_DISPLAY_MAX_TARGET_LEN, MAX_SYMBOLS_LEN);
|
||||||
|
|
||||||
int nSymbolsLoaded = 0;
|
int nSymbolsLoaded = 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue