ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

maybe fix ARL instruction

This commit is contained in:
espes 2015-07-13 01:21:07 +10:00
parent 1aa0eee37c
commit bf7948c70d
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/xbox/nv2a_vsh.c
View File

@ -381,8 +381,8 @@ static QString* decode_opcode_input(const uint32_t *shader_token,
static QString* decode_opcode(const uint32_t *shader_token, static QString* decode_opcode(const uint32_t *shader_token,
VshOutputMux out_mux, VshOutputMux out_mux,
uint32_t mask, uint32_t mask,
const char* opcode, const char *opcode,
QString *inputs) const char *inputs)
{ {
QString *ret = qstring_new(); QString *ret = qstring_new();
int reg_num = vsh_get_field(shader_token, FLD_OUT_R); int reg_num = vsh_get_field(shader_token, FLD_OUT_R);
@ -399,21 +399,11 @@ static QString* decode_opcode(const uint32_t *shader_token,
reg_num = 1; reg_num = 1;
} }
if (mask > 0) { if (strcmp(opcode, mac_opcode[MAC_ARL]) == 0) {
if (strcmp(opcode, mac_opcode[MAC_ARL]) == 0) { qstring_append_fmt(ret, " ARL(A0%s);\n", inputs);
qstring_append(ret, " ARL(a0"); } else if (mask > 0) {
qstring_append(ret, qstring_get_str(inputs)); qstring_append_fmt(ret, " %s(R%d%s%s);\n",
qstring_append(ret, ";\n"); opcode, reg_num, mask_str[mask], inputs);
} else {
qstring_append(ret, " ");
qstring_append(ret, opcode);
qstring_append(ret, "(");
qstring_append(ret, "R");
qstring_append_int(ret, reg_num);
qstring_append(ret, mask_str[mask]);
qstring_append(ret, qstring_get_str(inputs));
qstring_append(ret, ");\n");
}
} }
/* See if we must add a muxed opcode too: */ /* See if we must add a muxed opcode too: */
@ -439,7 +429,7 @@ static QString* decode_opcode(const uint32_t *shader_token,
qstring_append(ret, qstring_append(ret,
mask_str[ mask_str[
vsh_get_field(shader_token, FLD_OUT_O_MASK)]); vsh_get_field(shader_token, FLD_OUT_O_MASK)]);
qstring_append(ret, qstring_get_str(inputs)); qstring_append(ret, inputs);
qstring_append(ret, ");\n"); qstring_append(ret, ");\n");
} }
@ -493,7 +483,7 @@ static QString* decode_token(const uint32_t *shader_token)
OMUX_MAC, OMUX_MAC,
vsh_get_field(shader_token, FLD_OUT_MAC_MASK), vsh_get_field(shader_token, FLD_OUT_MAC_MASK),
mac_opcode[mac], mac_opcode[mac],
inputs_mac); qstring_get_str(inputs_mac));
QDECREF(inputs_mac); QDECREF(inputs_mac);
} else { } else {
ret = qstring_new(); ret = qstring_new();
@ -511,7 +501,7 @@ static QString* decode_token(const uint32_t *shader_token)
OMUX_ILU, OMUX_ILU,
vsh_get_field(shader_token, FLD_OUT_ILU_MASK), vsh_get_field(shader_token, FLD_OUT_ILU_MASK),
ilu_opcode[ilu], ilu_opcode[ilu],
inputs_c); qstring_get_str(inputs_c));
qstring_append(ret, qstring_get_str(ilu_op)); qstring_append(ret, qstring_get_str(ilu_op));