summaryrefslogtreecommitdiff
path: root/Source/Core/DSPCore
diff options
context:
space:
mode:
authorhrydgard <hrydgard@gmail.com>2009-05-03 11:57:53 +0000
committerhrydgard <hrydgard@gmail.com>2009-05-03 11:57:53 +0000
commit59ed31f291b0789c219095db4dc129b8fe56c787 (patch)
tree0c4f76d2b57bfc5958bb64daad101ab0658ad4dc /Source/Core/DSPCore
parent0772db6af6f35c700c6ff169bc94bef13d9b8cb7 (diff)
(just some obsessive code cleanup)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3142 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DSPCore')
-rw-r--r--Source/Core/DSPCore/Src/DspIntMultiplier.cpp6
-rw-r--r--Source/Core/DSPCore/Src/gdsp_ext_op.cpp78
2 files changed, 42 insertions, 42 deletions
diff --git a/Source/Core/DSPCore/Src/DspIntMultiplier.cpp b/Source/Core/DSPCore/Src/DspIntMultiplier.cpp
index 6a9cb47f30..853e51b8c7 100644
--- a/Source/Core/DSPCore/Src/DspIntMultiplier.cpp
+++ b/Source/Core/DSPCore/Src/DspIntMultiplier.cpp
@@ -200,7 +200,7 @@ void mulcmvz(const UDSPInstruction& opc)
// update prod
u8 sreg = (opc.hex >> 12) & 0x1;
u8 treg = (opc.hex >> 11) & 0x1;
- dsp_multiply(dsp_get_acc_m(sreg), (s64)dsp_get_ax_h(treg));
+ dsp_multiply(dsp_get_acc_m(sreg), dsp_get_ax_h(treg));
// update acc
u8 rreg = (opc.hex >> 8) & 0x1;
@@ -223,7 +223,7 @@ void mulcmv(const UDSPInstruction& opc)
// update prod
u8 sreg = (opc.hex >> 12) & 0x1;
u8 treg = (opc.hex >> 11) & 0x1;
- dsp_multiply(dsp_get_acc_m(sreg), (s64)dsp_get_ax_h(treg));
+ dsp_multiply(dsp_get_acc_m(sreg), dsp_get_ax_h(treg));
// update acc
u8 rreg = (opc.hex >> 8) & 0x1;
@@ -244,7 +244,7 @@ void mulcac(const UDSPInstruction& opc)
// update prod
u8 sreg = (opc.hex >> 12) & 0x1;
u8 treg = (opc.hex >> 11) & 0x1;
- dsp_multiply(dsp_get_acc_m(sreg), (s64)dsp_get_ax_h(treg));
+ dsp_multiply(dsp_get_acc_m(sreg), dsp_get_ax_h(treg));
// update acc
u8 rreg = (opc.hex >> 8) & 0x1;
diff --git a/Source/Core/DSPCore/Src/gdsp_ext_op.cpp b/Source/Core/DSPCore/Src/gdsp_ext_op.cpp
index 2ec0ec310e..43c4345dac 100644
--- a/Source/Core/DSPCore/Src/gdsp_ext_op.cpp
+++ b/Source/Core/DSPCore/Src/gdsp_ext_op.cpp
@@ -217,8 +217,8 @@ void dsp_op_ext_r_epi(const UDSPInstruction& opc)
case 0x02: // IR
dsp_increment_addr_reg(reg);
break;
-
- case 0x03: // NR
+
+ case 0x03: // NR
g_dsp.r[reg] += g_dsp.r[reg + 4];
break;
}
@@ -376,43 +376,43 @@ void dsp_op_ext_ops_pro(const UDSPInstruction& opc)
switch ((opc.hex >> 4) & 0xf)
{
- case 0x00:
- dsp_op_ext_r_epi(opc.hex);
- break;
-
- case 0x01:
- dsp_op_ext_mv(opc.hex);
- break;
-
- case 0x02:
- case 0x03:
- dsp_op_ext_s(opc.hex);
- break;
-
- case 0x04:
- case 0x05:
- case 0x06:
- case 0x07:
- dsp_op_ext_l(opc.hex);
- break;
-
- case 0x08:
- case 0x09:
- case 0x0a:
- case 0x0b:
- if (opc.hex & 0x2)
- dsp_op_ext_sl_pro(opc.hex);
- else
- dsp_op_ext_ls_pro(opc.hex);
-
- break;
-
- case 0x0c:
- case 0x0d:
- case 0x0e:
- case 0x0f:
- dsp_op_ext_ld(opc.hex);
- break;
+ case 0x00:
+ dsp_op_ext_r_epi(opc.hex);
+ break;
+
+ case 0x01:
+ dsp_op_ext_mv(opc.hex);
+ break;
+
+ case 0x02:
+ case 0x03:
+ dsp_op_ext_s(opc.hex);
+ break;
+
+ case 0x04:
+ case 0x05:
+ case 0x06:
+ case 0x07:
+ dsp_op_ext_l(opc.hex);
+ break;
+
+ case 0x08:
+ case 0x09:
+ case 0x0a:
+ case 0x0b:
+ if (opc.hex & 0x2)
+ dsp_op_ext_sl_pro(opc.hex);
+ else
+ dsp_op_ext_ls_pro(opc.hex);
+
+ break;
+
+ case 0x0c:
+ case 0x0d:
+ case 0x0e:
+ case 0x0f:
+ dsp_op_ext_ld(opc.hex);
+ break;
}
}