| Message ID | 20190408182748.1238-4-jan.bobek@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Fix RISU build for i386 | expand |
Jan Bobek <jan.bobek@gmail.com> writes: > CPU-specific code in risu_reginfo_* is expected to define and export > the following symbols: > > - arch_long_opts, arch_extra_help, process_arch_opt > - reginfo_size > - reginfo_init > - reginfo_is_eq > - reginfo_dump, reginfo_dump_mismatch > > Make risu_reginfo_i386.c implement this interface. > > Signed-off-by: Jan Bobek <jan.bobek@gmail.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > risu_reginfo_i386.c | 48 +++++++++++++++++++++++++++++++++++++++------ > 1 file changed, 42 insertions(+), 6 deletions(-) > > diff --git a/risu_reginfo_i386.c b/risu_reginfo_i386.c > index e8d671f..3882261 100644 > --- a/risu_reginfo_i386.c > +++ b/risu_reginfo_i386.c > @@ -10,12 +10,28 @@ > ******************************************************************************/ > > #include <stdio.h> > +#include <stdlib.h> > +#include <string.h> > #include <ucontext.h> > > #include "risu.h" > #include "risu_reginfo_i386.h" > > -static void fill_reginfo(struct reginfo *ri, ucontext_t * uc) > +const struct option * const arch_long_opts; > +const char * const arch_extra_help; > + > +void process_arch_opt(int opt, const char *arg) > +{ > + abort(); > +} > + > +const int reginfo_size(void) > +{ > + return sizeof(struct reginfo); > +} > + > +/* reginfo_init: initialize with a ucontext */ > +void reginfo_init(struct reginfo *ri, ucontext_t *uc) > { > int i; > for (i = 0; i < NGREG; i++) { > @@ -51,18 +67,38 @@ static void fill_reginfo(struct reginfo *ri, ucontext_t * uc) > ri->faulting_insn = *((uint32_t *) uc->uc_mcontext.gregs[REG_EIP]); > } > > -static char *regname[] = { > +/* reginfo_is_eq: compare the reginfo structs, returns nonzero if equal */ > +int reginfo_is_eq(struct reginfo *m, struct reginfo *a) > +{ > + return 0 == memcmp(m, a, sizeof(*m)); > +} > + > +static const char *const regname[NGREG] = { > "GS", "FS", "ES", "DS", "EDI", "ESI", "EBP", "ESP", > "EBX", "EDX", "ECX", "EAX", "TRAPNO", "ERR", "EIP", > - "CS", "EFL", "UESP", "SS", 0 > + "CS", "EFL", "UESP", "SS" > }; > > -static void dump_reginfo(struct reginfo *ri) > +/* reginfo_dump: print state to a stream, returns nonzero on success */ > +int reginfo_dump(struct reginfo *ri, FILE *f) > { > int i; > - fprintf(stderr, " faulting insn %x\n", ri->faulting_insn); > + fprintf(f, " faulting insn %x\n", ri->faulting_insn); > for (i = 0; i < NGREG; i++) { > - fprintf(stderr, " %s: %x\n", regname[i] ? regname[i] : "???", > + fprintf(f, " %s: %x\n", regname[i] ? regname[i] : "???", > ri->gregs[i]); > } > + return !ferror(f); > +} > + > +int reginfo_dump_mismatch(struct reginfo *m, struct reginfo *a, FILE *f) > +{ > + int i; > + for (i = 0; i < NGREG; i++) { > + if (m->gregs[i] != a->gregs[i]) { > + fprintf(f, "Mismatch: Register %s\n", regname[i] ? regname[i] : "???"); > + fprintf(f, "m: [%x] != a: [%x]\n", m->gregs[i], a->gregs[i]); > + } > + } > + return !ferror(f); > } -- Alex Bennée
diff --git a/risu_reginfo_i386.c b/risu_reginfo_i386.c index e8d671f..3882261 100644 --- a/risu_reginfo_i386.c +++ b/risu_reginfo_i386.c @@ -10,12 +10,28 @@ ******************************************************************************/ #include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <ucontext.h> #include "risu.h" #include "risu_reginfo_i386.h" -static void fill_reginfo(struct reginfo *ri, ucontext_t * uc) +const struct option * const arch_long_opts; +const char * const arch_extra_help; + +void process_arch_opt(int opt, const char *arg) +{ + abort(); +} + +const int reginfo_size(void) +{ + return sizeof(struct reginfo); +} + +/* reginfo_init: initialize with a ucontext */ +void reginfo_init(struct reginfo *ri, ucontext_t *uc) { int i; for (i = 0; i < NGREG; i++) { @@ -51,18 +67,38 @@ static void fill_reginfo(struct reginfo *ri, ucontext_t * uc) ri->faulting_insn = *((uint32_t *) uc->uc_mcontext.gregs[REG_EIP]); } -static char *regname[] = { +/* reginfo_is_eq: compare the reginfo structs, returns nonzero if equal */ +int reginfo_is_eq(struct reginfo *m, struct reginfo *a) +{ + return 0 == memcmp(m, a, sizeof(*m)); +} + +static const char *const regname[NGREG] = { "GS", "FS", "ES", "DS", "EDI", "ESI", "EBP", "ESP", "EBX", "EDX", "ECX", "EAX", "TRAPNO", "ERR", "EIP", - "CS", "EFL", "UESP", "SS", 0 + "CS", "EFL", "UESP", "SS" }; -static void dump_reginfo(struct reginfo *ri) +/* reginfo_dump: print state to a stream, returns nonzero on success */ +int reginfo_dump(struct reginfo *ri, FILE *f) { int i; - fprintf(stderr, " faulting insn %x\n", ri->faulting_insn); + fprintf(f, " faulting insn %x\n", ri->faulting_insn); for (i = 0; i < NGREG; i++) { - fprintf(stderr, " %s: %x\n", regname[i] ? regname[i] : "???", + fprintf(f, " %s: %x\n", regname[i] ? regname[i] : "???", ri->gregs[i]); } + return !ferror(f); +} + +int reginfo_dump_mismatch(struct reginfo *m, struct reginfo *a, FILE *f) +{ + int i; + for (i = 0; i < NGREG; i++) { + if (m->gregs[i] != a->gregs[i]) { + fprintf(f, "Mismatch: Register %s\n", regname[i] ? regname[i] : "???"); + fprintf(f, "m: [%x] != a: [%x]\n", m->gregs[i], a->gregs[i]); + } + } + return !ferror(f); }
CPU-specific code in risu_reginfo_* is expected to define and export the following symbols: - arch_long_opts, arch_extra_help, process_arch_opt - reginfo_size - reginfo_init - reginfo_is_eq - reginfo_dump, reginfo_dump_mismatch Make risu_reginfo_i386.c implement this interface. Signed-off-by: Jan Bobek <jan.bobek@gmail.com> --- risu_reginfo_i386.c | 48 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-)