@@ -74,4 +74,9 @@ void set_ucontext_paramreg(void *vuc, uint64_t value);
/* Return the value of the parameter register from a reginfo. */
uint64_t get_reginfo_paramreg(struct reginfo *ri);
+/* Return the risu operation number we have been asked to do,
+ * or -1 if this was a SIGILL for a non-risuop insn.
+ */
+int get_risuop(struct reginfo *ri);
+
#endif /* RISU_H */
@@ -41,11 +41,12 @@ uint64_t get_reginfo_paramreg(struct reginfo *ri)
return ri->regs[0];
}
-static int get_risuop(uint32_t insn)
+int get_risuop(struct reginfo *ri)
{
/* Return the risuop we have been asked to do
* (or -1 if this was a SIGILL for a non-risuop insn)
*/
+ uint32_t insn = ri->faulting_insn;
uint32_t op = insn & 0xf;
uint32_t key = insn & ~0xf;
uint32_t risukey = 0x00005af0;
@@ -57,7 +58,7 @@ int send_register_info(int sock, void *uc)
struct reginfo ri;
int op;
reginfo_init(&ri, uc);
- op = get_risuop(ri.faulting_insn);
+ op = get_risuop(&ri);
switch (op) {
case OP_COMPARE:
@@ -94,7 +95,7 @@ int recv_and_compare_register_info(int sock, void *uc)
int resp = 0, op;
reginfo_init(&master_ri, uc);
- op = get_risuop(master_ri.faulting_insn);
+ op = get_risuop(&master_ri);
switch (op) {
case OP_COMPARE:
@@ -64,24 +64,25 @@ uint64_t get_reginfo_paramreg(struct reginfo *ri)
return ri->gpreg[0];
}
-static int get_risuop(uint32_t insn, int isz)
+int get_risuop(struct reginfo *ri)
{
/* Return the risuop we have been asked to do
* (or -1 if this was a SIGILL for a non-risuop insn)
*/
+ uint32_t insn = ri->faulting_insn;
+ int isz = ri->faulting_insn_size;
uint32_t op = insn & 0xf;
uint32_t key = insn & ~0xf;
uint32_t risukey = (isz == 2) ? 0xdee0 : 0xe7fe5af0;
return (key != risukey) ? -1 : op;
}
-
int send_register_info(int sock, void *uc)
{
struct reginfo ri;
int op;
reginfo_init(&ri, uc);
- op = get_risuop(ri.faulting_insn, ri.faulting_insn_size);
+ op = get_risuop(&ri);
switch (op)
{
@@ -119,7 +120,7 @@ int recv_and_compare_register_info(int sock, void *uc)
int resp = 0, op;
reginfo_init(&master_ri, uc);
- op = get_risuop(master_ri.faulting_insn, master_ri.faulting_insn_size);
+ op = get_risuop(&master_ri);
switch (op)
{
@@ -36,8 +36,9 @@ uint64_t get_reginfo_paramreg(struct reginfo *ri)
return ri->gregs[R_A0];
}
-static int get_risuop(uint32_t insn)
+int get_risuop(struct reginfo *ri)
{
+ uint32_t insn = ri->faulting_insn;
uint32_t op = insn & 0xf;
uint32_t key = insn & ~0xf;
uint32_t risukey = 0x4afc7000;
@@ -50,7 +51,7 @@ int send_register_info(int sock, void *uc)
int op;
reginfo_init(&ri, uc);
- op = get_risuop(ri.faulting_insn);
+ op = get_risuop(&ri);
switch (op) {
case OP_COMPARE:
@@ -81,7 +82,7 @@ int recv_and_compare_register_info(int sock, void *uc)
int op;
reginfo_init(&master_ri, uc);
- op = get_risuop(master_ri.faulting_insn);
+ op = get_risuop(&master_ri);
switch (op) {
case OP_COMPARE:
@@ -41,8 +41,9 @@ uint64_t get_reginfo_paramreg(struct reginfo *ri)
return ri->gregs[0];
}
-static int get_risuop(uint32_t insn)
+int get_risuop(struct reginfo *ri)
{
+ uint32_t insn = ri->faulting_insn;
uint32_t op = insn & 0xf;
uint32_t key = insn & ~0xf;
uint32_t risukey = 0x00005af0;
@@ -55,7 +56,7 @@ int send_register_info(int sock, void *uc)
int op;
reginfo_init(&ri, uc);
- op = get_risuop(ri.faulting_insn);
+ op = get_risuop(&ri);
switch (op) {
case OP_COMPARE:
@@ -86,7 +87,7 @@ int recv_and_compare_register_info(int sock, void *uc)
int op;
reginfo_init(&master_ri, uc);
- op = get_risuop(master_ri.faulting_insn);
+ op = get_risuop(&master_ri);
switch (op) {
case OP_COMPARE: