valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Made data preview safe (not showing addresses out of mem range)

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@952
This commit is contained in:
Ulf Wohlers 2003-04-20 12:13:58 +00:00
parent 0ab79955e6
commit da7f3c8829
1 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/debug/debug.cpp
View file

@ -34,6 +34,7 @@
#include "mixer.h"
#include "debug_inc.h"
#include "timer.h"
#include "../ints/xms.h"
#include "../shell/shell_inc.h"
#ifdef WIN32
@ -1090,24 +1091,25 @@ char* AnalyzeInstruction(char* inst, bool saveSelector)
pos++;
};
Bit32u address = GetAddress(seg,adr);
static char outmask[] = "%s:[%04X]=%02X";
if (cpu.state & STATE_PROTECTED) outmask[6] = '8';
if (address<(XMS_GetSize()+1)*1024*1024) {
static char outmask[] = "%s:[%04X]=%02X";
if (cpu.state & STATE_PROTECTED) outmask[6] = '8';
switch (DasmLastOperandSize()) {
case 8 : { Bit8u val = mem_readb(address);
outmask[12] = '2';
sprintf(result,outmask,prefix,adr,val);
} break;
case 16: { Bit16u val = mem_readw(address);
outmask[12] = '4';
sprintf(result,outmask,prefix,adr,val);
} break;
case 32: { Bit32u val = mem_readd(address);
outmask[12] = '8';
sprintf(result,outmask,prefix,adr,val);
} break;
switch (DasmLastOperandSize()) {
case 8 : { Bit8u val = mem_readb(address);
outmask[12] = '2';
sprintf(result,outmask,prefix,adr,val);
} break;
case 16: { Bit16u val = mem_readw(address);
outmask[12] = '4';
sprintf(result,outmask,prefix,adr,val);
} break;
case 32: { Bit32u val = mem_readd(address);
outmask[12] = '8';
sprintf(result,outmask,prefix,adr,val);
} break;
}
}
// Variable found ?
CDebugVar* var = CDebugVar::FindVar(address);