aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Del Campo Romero <xavi.dcr@tutanota.com>2020-05-23 18:22:51 +0200
committerXavier Del Campo Romero <xavi.dcr@tutanota.com>2020-05-23 18:22:55 +0200
commit9e71e29d6493fedf98cd8f336c386018d642fc6c (patch)
tree693b58af50c79234a5120c874aa49e91f2574148
parentebe31dc0d18d11d38060478a3c631c0edb693731 (diff)
downloadgdbstub-9e71e29d6493fedf98cd8f336c386018d642fc6c.tar.gz
Replaced DBG_CPU_I386_NUM_REGISTERS by DBG_CPU_NUM_REGISTERS
This allows gdbstub.c to be compiled with other gdbstub_sys.c definitions by keeping one definition for the total number of registers available on the target.
-rw-r--r--arch_x86/gdbstub_sys.h4
-rw-r--r--gdbstub.c14
2 files changed, 9 insertions, 9 deletions
diff --git a/arch_x86/gdbstub_sys.h b/arch_x86/gdbstub_sys.h
index 82f7ca9..18878d9 100644
--- a/arch_x86/gdbstub_sys.h
+++ b/arch_x86/gdbstub_sys.h
@@ -104,12 +104,12 @@ enum DBG_REGISTER {
DBG_CPU_I386_REG_ES = 13,
DBG_CPU_I386_REG_FS = 14,
DBG_CPU_I386_REG_GS = 15,
- DBG_CPU_I386_NUM_REGISTERS = 16
+ DBG_CPU_NUM_REGISTERS = 16
};
struct dbg_state {
int signum;
- reg registers[DBG_CPU_I386_NUM_REGISTERS];
+ reg registers[DBG_CPU_NUM_REGISTERS];
};
/*****************************************************************************
diff --git a/gdbstub.c b/gdbstub.c
index 439bd4f..611793a 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -807,7 +807,7 @@ int dbg_main(struct dbg_state *state)
pkt_len = status;
dbg_send_packet(pkt_buf, pkt_len);
break;
-
+
/*
* Write Registers
* Command Format: G XX...
@@ -830,7 +830,7 @@ int dbg_main(struct dbg_state *state)
ptr_next += 1;
token_expect_integer_arg(addr);
- if (addr >= DBG_CPU_I386_NUM_REGISTERS) {
+ if (addr >= DBG_CPU_NUM_REGISTERS) {
goto error;
}
@@ -843,7 +843,7 @@ int dbg_main(struct dbg_state *state)
}
dbg_send_packet(pkt_buf, status);
break;
-
+
/*
* Write a Register
* Command Format: P n...=r...
@@ -853,7 +853,7 @@ int dbg_main(struct dbg_state *state)
token_expect_integer_arg(addr);
token_expect_seperator('=');
- if (addr < DBG_CPU_I386_NUM_REGISTERS) {
+ if (addr < DBG_CPU_NUM_REGISTERS) {
status = dbg_dec_hex(ptr_next, token_remaining_buf,
(char *)&(state->registers[addr]),
sizeof(state->registers[addr]));
@@ -863,7 +863,7 @@ int dbg_main(struct dbg_state *state)
}
dbg_send_ok_packet(pkt_buf, sizeof(pkt_buf));
break;
-
+
/*
* Read Memory
* Command Format: m addr,length
@@ -882,7 +882,7 @@ int dbg_main(struct dbg_state *state)
}
dbg_send_packet(pkt_buf, status);
break;
-
+
/*
* Write Memory
* Command Format: M addr,length:XX..
@@ -923,7 +923,7 @@ int dbg_main(struct dbg_state *state)
dbg_send_ok_packet(pkt_buf, sizeof(pkt_buf));
break;
- /*
+ /*
* Continue
* Command Format: c [addr]
*/