Emulation/cen64
1
0
Fork 0
mirror of https://github.com/n64dev/cen64.git synced 2024-06-20 21:17:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add correct INFO to trap macros

Browse source 
Correctly annotate unused parameters in trap functions
This commit is contained in:
James Lambert 2020-12-27 10:30:26 -07:00
parent 054bcb90f7
commit ee9cd6f0da
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
vr4300/functions.c
View file

@ -428,7 +428,7 @@ int VR4300_BREAK(struct vr4300 *vr4300,
// TNEI
//
int VR4300_TEQ_TNE(struct vr4300 *vr4300,
uint32_t unused(iw), uint64_t rs, uint64_t rt) {
uint32_t iw, uint64_t rs, uint64_t rt) {
bool is_ne = iw >> 1 & 0x1;
bool cmp = rs == rt;
@ -441,7 +441,7 @@ int VR4300_TEQ_TNE(struct vr4300 *vr4300,
}
int VR4300_TEQI_TNEI(struct vr4300 *vr4300,
uint32_t unused(iw), uint64_t rs, uint64_t rt) {
uint32_t iw, uint64_t rs, uint64_t unused(rt)) {
int64_t imm = (int16_t) iw;
bool is_ne = iw >> 17 & 0x1;
@ -455,7 +455,7 @@ int VR4300_TEQI_TNEI(struct vr4300 *vr4300,
}
int VR4300_TGE_TLT(struct vr4300 *vr4300,
uint32_t unused(iw), uint64_t rs, uint64_t rt) {
uint32_t iw, uint64_t rs, uint64_t rt) {
bool is_lt = iw >> 1 & 0x1;
bool cmp = (int64_t)rs >= (int64_t)rt;
@ -468,7 +468,7 @@ int VR4300_TGE_TLT(struct vr4300 *vr4300,
}
int VR4300_TGEI_TLTI(struct vr4300 *vr4300,
uint32_t unused(iw), uint64_t rs, uint64_t rt) {
uint32_t iw, uint64_t rs, uint64_t unused(rt)) {
int64_t imm = (int16_t) iw;
bool is_lt = iw >> 17 & 0x1;
@ -482,7 +482,7 @@ int VR4300_TGEI_TLTI(struct vr4300 *vr4300,
}
int VR4300_TGEIU_TLTIU(struct vr4300 *vr4300,
uint32_t unused(iw), uint64_t rs, uint64_t rt) {
uint32_t iw, uint64_t rs, uint64_t unused(rt)) {
int64_t imm = (int16_t) iw;
bool is_lt = iw >> 17 & 0x1;
@ -496,7 +496,7 @@ int VR4300_TGEIU_TLTIU(struct vr4300 *vr4300,
}
int VR4300_TGEU_TLTU(struct vr4300 *vr4300,
uint32_t unused(iw), uint64_t rs, uint64_t rt) {
uint32_t iw, uint64_t rs, uint64_t rt) {
bool is_lt = iw >> 1 & 0x1;
bool cmp = rs >= rt;

24
vr4300/opcodes_priv.h
View file

@ -125,18 +125,18 @@
#define SWR VR4300_BUILD_OP(SWR, SWL_SWR, INFO3(NEEDRS, NEEDRT, STORE))
#define SYNC VR4300_BUILD_OP(SYNC, SLL_SLLV, INFO1(NONE))
#define SYSCALL VR4300_BUILD_OP(SYSCALL, SYSCALL, INFO1(NONE))
#define TEQ VR4300_BUILD_OP(TEQ, TEQ_TNE, INFO1(NONE))
#define TEQI VR4300_BUILD_OP(TEQI, TEQI_TNEI, INFO1(NONE))
#define TGE VR4300_BUILD_OP(TGE, TGE_TLT, INFO1(NONE))
#define TGEI VR4300_BUILD_OP(TGEI, TGEI_TLTI, INFO1(NONE))
#define TGEIU VR4300_BUILD_OP(TGEIU, TGEIU_TLTIU, INFO1(NONE))
#define TGEU VR4300_BUILD_OP(TGEU, TGEU_TLTU, INFO1(NONE))
#define TLT VR4300_BUILD_OP(TLT, TGE_TLT, INFO1(NONE))
#define TLTI VR4300_BUILD_OP(TLTI, TGEI_TLTI, INFO1(NONE))
#define TLTIU VR4300_BUILD_OP(TLTIU, TGEIU_TLTIU, INFO1(NONE))
#define TLTU VR4300_BUILD_OP(TLTU, TGEU_TLTU, INFO1(NONE))
#define TNE VR4300_BUILD_OP(TNE, TEQ_TNE, INFO1(NONE))
#define TNEI VR4300_BUILD_OP(TNEI, TEQI_TNEI, INFO1(NONE))
#define TEQ VR4300_BUILD_OP(TEQ, TEQ_TNE, INFO2(NEEDRS, NEEDRT))
#define TEQI VR4300_BUILD_OP(TEQI, TEQI_TNEI, INFO1(NEEDRS))
#define TGE VR4300_BUILD_OP(TGE, TGE_TLT, INFO2(NEEDRS, NEEDRT))
#define TGEI VR4300_BUILD_OP(TGEI, TGEI_TLTI, INFO1(NEEDRS))
#define TGEIU VR4300_BUILD_OP(TGEIU, TGEIU_TLTIU, INFO1(NEEDRS))
#define TGEU VR4300_BUILD_OP(TGEU, TGEU_TLTU, INFO2(NEEDRS, NEEDRT))
#define TLT VR4300_BUILD_OP(TLT, TGE_TLT, INFO2(NEEDRS, NEEDRT))
#define TLTI VR4300_BUILD_OP(TLTI, TGEI_TLTI, INFO1(NEEDRS))
#define TLTIU VR4300_BUILD_OP(TLTIU, TGEIU_TLTIU, INFO1(NEEDRS))
#define TLTU VR4300_BUILD_OP(TLTU, TGEU_TLTU, INFO2(NEEDRS, NEEDRT))
#define TNE VR4300_BUILD_OP(TNE, TEQ_TNE, INFO2(NEEDRS, NEEDRT))
#define TNEI VR4300_BUILD_OP(TNEI, TEQI_TNEI, INFO1(NEEDRS))
#define XOR VR4300_BUILD_OP(XOR, AND_OR_XOR, INFO2(NEEDRS, NEEDRT))
#define XORI VR4300_BUILD_OP(XORI, ANDI_ORI_XORI, INFO1(NEEDRS))