@@ -89,7 +89,7 @@ int recv_and_compare_register_info(int sock, void *uc)
if (recv_data_pkt(sock, &apprentice_ri, sizeof(apprentice_ri))) {
packet_mismatch = 1;
resp = 2;
- } else if (!reginfo_is_eq(&master_ri, &apprentice_ri, uc)) {
+ } else if (!reginfo_is_eq(&master_ri, &apprentice_ri)) {
resp = 2;
}
else if (op == OP_TESTEND) {
@@ -134,7 +134,7 @@ int report_match_status(void)
fprintf(stderr, "master reginfo:\n");
reginfo_dump(&master_ri, 0);
}
- if (!reginfo_is_eq(&master_ri, &apprentice_ri, NULL)) {
+ if (!reginfo_is_eq(&master_ri, &apprentice_ri)) {
fprintf(stderr, "mismatch on regs!\n");
resp = 1;
}
@@ -50,7 +50,7 @@ void reginfo_init(struct reginfo *ri, ucontext_t *uc)
}
/* reginfo_is_eq: compare the reginfo structs, returns nonzero if equal */
-int reginfo_is_eq(struct reginfo *m, struct reginfo *a, ucontext_t *uc)
+int reginfo_is_eq(struct reginfo *m, struct reginfo *a)
{
int i;
for (i = 0; i < 32; i++) {
@@ -86,14 +86,6 @@ int reginfo_is_eq(struct reginfo *m, struct reginfo *a, ucontext_t *uc)
m->vrregs.vrregs[i][1] != a->vrregs.vrregs[i][1] ||
m->vrregs.vrregs[i][2] != a->vrregs.vrregs[i][2] ||
m->vrregs.vrregs[i][3] != a->vrregs.vrregs[i][3]) {
-
- if (uc != NULL && (m->gregs[CCR] & 0x10)) {
- uc->uc_mcontext.v_regs->vrregs[i][0] = a->vrregs.vrregs[i][0];
- uc->uc_mcontext.v_regs->vrregs[i][1] = a->vrregs.vrregs[i][1];
- uc->uc_mcontext.v_regs->vrregs[i][2] = a->vrregs.vrregs[i][2];
- uc->uc_mcontext.v_regs->vrregs[i][3] = a->vrregs.vrregs[i][3];
- return 1;
- }
return 0;
}
}
@@ -29,7 +29,7 @@ struct reginfo
void reginfo_init(struct reginfo *ri, ucontext_t *uc);
/* return 1 if structs are equal, 0 otherwise. */
-int reginfo_is_eq(struct reginfo *r1, struct reginfo *r2, ucontext_t *uc);
+int reginfo_is_eq(struct reginfo *r1, struct reginfo *r2);
/* print reginfo state to a stream */
void reginfo_dump(struct reginfo *ri, int is_master);