| Message ID | 20190408182748.1238-6-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: > The code being removed is a remnant of the past implementation; it has > since been replaced by its more powerful, architecture-independent > counterpart in reginfo.c. > > Signed-off-by: Jan Bobek <jan.bobek@gmail.com> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > risu_i386.c | 58 ----------------------------------------------------- > 1 file changed, 58 deletions(-) > > diff --git a/risu_i386.c b/risu_i386.c > index eb4dff4..14b0db3 100644 > --- a/risu_i386.c > +++ b/risu_i386.c > @@ -16,13 +16,6 @@ > #include "risu.h" > #include "risu_reginfo_i386.h" > > -struct reginfo master_ri, apprentice_ri; > - > -static int insn_is_ud2(uint32_t insn) > -{ > - return ((insn & 0xffff) == 0x0b0f); > -} > - > void advance_pc(void *vuc) > { > ucontext_t *uc = (ucontext_t *) vuc; > @@ -61,54 +54,3 @@ uintptr_t get_pc(struct reginfo *ri) > { > return ri->gregs[REG_EIP]; > } > - > -int send_register_info(int sock, void *uc) > -{ > - struct reginfo ri; > - fill_reginfo(&ri, uc); > - return send_data_pkt(sock, &ri, sizeof(ri)); > -} > - > -/* Read register info from the socket and compare it with that from the > - * ucontext. Return 0 for match, 1 for end-of-test, 2 for mismatch. > - * NB: called from a signal handler. > - */ > -int recv_and_compare_register_info(int sock, void *uc) > -{ > - int resp; > - fill_reginfo(&master_ri, uc); > - recv_data_pkt(sock, &apprentice_ri, sizeof(apprentice_ri)); > - if (memcmp(&master_ri, &apprentice_ri, sizeof(master_ri)) != 0) { > - /* mismatch */ > - resp = 2; > - } else if (insn_is_ud2(master_ri.faulting_insn)) { > - /* end of test */ > - resp = 1; > - } else { > - /* either successful match or expected undef */ > - resp = 0; > - } > - send_response_byte(sock, resp); > - return resp; > -} > - > -/* Print a useful report on the status of the last comparison > - * done in recv_and_compare_register_info(). This is called on > - * exit, so need not restrict itself to signal-safe functions. > - * Should return 0 if it was a good match (ie end of test) > - * and 1 for a mismatch. > - */ > -int report_match_status(void) > -{ > - fprintf(stderr, "match status...\n"); > - fprintf(stderr, "master reginfo:\n"); > - dump_reginfo(&master_ri); > - fprintf(stderr, "apprentice reginfo:\n"); > - dump_reginfo(&apprentice_ri); > - if (memcmp(&master_ri, &apprentice_ri, sizeof(master_ri)) == 0) { > - fprintf(stderr, "match!\n"); > - return 0; > - } > - fprintf(stderr, "mismatch!\n"); > - return 1; > -} -- Alex Bennée
diff --git a/risu_i386.c b/risu_i386.c index eb4dff4..14b0db3 100644 --- a/risu_i386.c +++ b/risu_i386.c @@ -16,13 +16,6 @@ #include "risu.h" #include "risu_reginfo_i386.h" -struct reginfo master_ri, apprentice_ri; - -static int insn_is_ud2(uint32_t insn) -{ - return ((insn & 0xffff) == 0x0b0f); -} - void advance_pc(void *vuc) { ucontext_t *uc = (ucontext_t *) vuc; @@ -61,54 +54,3 @@ uintptr_t get_pc(struct reginfo *ri) { return ri->gregs[REG_EIP]; } - -int send_register_info(int sock, void *uc) -{ - struct reginfo ri; - fill_reginfo(&ri, uc); - return send_data_pkt(sock, &ri, sizeof(ri)); -} - -/* Read register info from the socket and compare it with that from the - * ucontext. Return 0 for match, 1 for end-of-test, 2 for mismatch. - * NB: called from a signal handler. - */ -int recv_and_compare_register_info(int sock, void *uc) -{ - int resp; - fill_reginfo(&master_ri, uc); - recv_data_pkt(sock, &apprentice_ri, sizeof(apprentice_ri)); - if (memcmp(&master_ri, &apprentice_ri, sizeof(master_ri)) != 0) { - /* mismatch */ - resp = 2; - } else if (insn_is_ud2(master_ri.faulting_insn)) { - /* end of test */ - resp = 1; - } else { - /* either successful match or expected undef */ - resp = 0; - } - send_response_byte(sock, resp); - return resp; -} - -/* Print a useful report on the status of the last comparison - * done in recv_and_compare_register_info(). This is called on - * exit, so need not restrict itself to signal-safe functions. - * Should return 0 if it was a good match (ie end of test) - * and 1 for a mismatch. - */ -int report_match_status(void) -{ - fprintf(stderr, "match status...\n"); - fprintf(stderr, "master reginfo:\n"); - dump_reginfo(&master_ri); - fprintf(stderr, "apprentice reginfo:\n"); - dump_reginfo(&apprentice_ri); - if (memcmp(&master_ri, &apprentice_ri, sizeof(master_ri)) == 0) { - fprintf(stderr, "match!\n"); - return 0; - } - fprintf(stderr, "mismatch!\n"); - return 1; -}
The code being removed is a remnant of the past implementation; it has since been replaced by its more powerful, architecture-independent counterpart in reginfo.c. Signed-off-by: Jan Bobek <jan.bobek@gmail.com> --- risu_i386.c | 58 ----------------------------------------------------- 1 file changed, 58 deletions(-)