Some small bug fixes

Change-Id: I2119c57f24be5675b4530fda9dc3b971935706c7
This commit is contained in:
David Banks 2015-07-04 14:50:55 +01:00
parent 17d02c19fa
commit 5dad7cf788
2 changed files with 3 additions and 2 deletions

View File

@ -358,7 +358,7 @@ char *modeStrings[NUM_MODES] = {
#define BW_RDWR_MASK (BW_RD_MASK | BW_WR_MASK)
// Mask for all breakpoints that read/write Memory or IO
#define B_RDWR_MASK (BW_RD_MASK & B_MASK)
#define B_RDWR_MASK (BW_RDWR_MASK & B_MASK)
/********************************************************
* External Trigger definitions
@ -951,6 +951,7 @@ void doCmdReset(char *params) {
hwCmd(CMD_STEP, 0);
Delay_us(50);
hwCmd(CMD_RESET, 0);
logAddr();
}
#ifdef CPUEMBEDDED

View File

@ -32,7 +32,7 @@ typedef signed short tt_s16;
unsigned int get_memw(unsigned int addr) {
loadAddr(addr);
return readMemByteInc() + (readMemByteInc() << 8);
return (readMemByteInc() << 8) + readMemByteInc();
}
enum opcodes {