tests: Silence warnings in skyeye code

Gets rid of warning noise when compiling the tests.
This commit is contained in:
Lioncash 2018-07-17 11:43:35 -04:00 committed by MerryMage
parent 0ec8dac660
commit 5b39e8dcf8
3 changed files with 73 additions and 74 deletions

View file

@ -20,20 +20,8 @@
/* Note: this file handles interface with arm core and vfp registers */
#ifdef _MSC_VER
#pragma warning(disable : 4100)
#endif
#ifdef __GNUC__
#pragma GCC diagnostic warning "-Wunused-parameter"
#endif
#ifdef __clang__
#pragma clang diagnostic warning "-Wunused-parameter"
#endif
#include "common/assert.h"
//#include "common/common_funcs.h"
#include "common/common_types.h"
//#include "common/logging/log.h"
#include "A32/skyeye_interpreter/skyeye_common/armstate.h"
#include "A32/skyeye_interpreter/skyeye_common/vfp/asm_vfp.h"
@ -58,7 +46,7 @@ void VFPInit(ARMul_State* state)
state->VFP[VFP_MVFR1] = 0;
}
void VMOVBRS(ARMul_State* state, u32 to_arm, u32 t, u32 n, u32* value)
void VMOVBRS(ARMul_State* state, u32 to_arm, [[maybe_unused]] u32 t, u32 n, u32* value)
{
if (to_arm)
{
@ -70,7 +58,8 @@ void VMOVBRS(ARMul_State* state, u32 to_arm, u32 t, u32 n, u32* value)
}
}
void VMOVBRRD(ARMul_State* state, u32 to_arm, u32 t, u32 t2, u32 n, u32* value1, u32* value2)
void VMOVBRRD(ARMul_State* state, u32 to_arm, [[maybe_unused]] u32 t, [[maybe_unused]] u32 t2,
u32 n, u32* value1, u32* value2)
{
if (to_arm)
{
@ -83,7 +72,8 @@ void VMOVBRRD(ARMul_State* state, u32 to_arm, u32 t, u32 t2, u32 n, u32* value1,
state->ExtReg[n*2] = *value1;
}
}
void VMOVBRRSS(ARMul_State* state, u32 to_arm, u32 t, u32 t2, u32 n, u32* value1, u32* value2)
void VMOVBRRSS(ARMul_State* state, u32 to_arm, [[maybe_unused]] u32 t, [[maybe_unused]] u32 t2,
u32 n, u32* value1, u32* value2)
{
if (to_arm)
{
@ -159,8 +149,6 @@ void vfp_raise_exceptions(ARMul_State* state, u32 exceptions, u32 inst, u32 fpsc
LOG_TRACE(Core_ARM11, "VFP: raising exceptions %08x", exceptions);
if (exceptions == VFP_EXCEPTION_ERROR) {
// LOG_CRITICAL(Core_ARM11, "unhandled bounce %x", inst);
// Crash();
ASSERT_MSG(false, "unhandled bounce {:08x}", inst);
}

View file

@ -54,15 +54,8 @@
#ifdef _MSC_VER
#pragma warning(disable : 4100 4244 4245)
#endif
#ifdef __GNUC__
#pragma GCC diagnostic warning "-Wunused-parameter"
#endif
#ifdef __clang__
#pragma clang diagnostic warning "-Wunused-parameter"
#endif
#include <algorithm>
//#include "common/logging/log.h"
#include "A32/skyeye_interpreter/skyeye_common/vfp/vfp.h"
#include "A32/skyeye_interpreter/skyeye_common/vfp/vfp_helper.h"
#include "A32/skyeye_interpreter/skyeye_common/vfp/asm_vfp.h"
@ -76,7 +69,7 @@ static struct vfp_double vfp_double_default_qnan = {
VFP_DOUBLE_SIGNIFICAND_QNAN,
};
static void vfp_double_dump(const char *str, struct vfp_double *d)
static void vfp_double_dump([[maybe_unused]] const char *str, [[maybe_unused]] vfp_double *d)
{
LOG_TRACE(Core_ARM11, "VFP: %s: sign=%d exponent=%d significand=%016llx",
str, d->sign != 0, d->exponent, d->significand);
@ -98,7 +91,8 @@ static void vfp_double_normalise_denormal(struct vfp_double *vd)
vfp_double_dump("normalise_denormal: out", vd);
}
u32 vfp_double_normaliseround(ARMul_State* state, int dd, struct vfp_double *vd, u32 fpscr, const char *func)
u32 vfp_double_normaliseround(ARMul_State* state, int dd, vfp_double *vd, u32 fpscr,
[[maybe_unused]] const char *func)
{
u64 significand, incr;
int exponent, shift, underflow;
@ -279,28 +273,32 @@ vfp_propagate_nan(struct vfp_double *vdd, struct vfp_double *vdn,
/*
* Extended operations
*/
static u32 vfp_double_fabs(ARMul_State* state, int dd, int unused, int dm, u32 fpscr)
static u32 vfp_double_fabs(ARMul_State* state, int dd, [[maybe_unused]] int unused, int dm,
[[maybe_unused]] u32 fpscr)
{
LOG_TRACE(Core_ARM11, "In %s", __FUNCTION__);
vfp_put_double(state, vfp_double_packed_abs(vfp_get_double(state, dm)), dd);
return 0;
}
static u32 vfp_double_fcpy(ARMul_State* state, int dd, int unused, int dm, u32 fpscr)
static u32 vfp_double_fcpy(ARMul_State* state, int dd, [[maybe_unused]] int unused, int dm,
[[maybe_unused]] u32 fpscr)
{
LOG_TRACE(Core_ARM11, "In %s", __FUNCTION__);
vfp_put_double(state, vfp_get_double(state, dm), dd);
return 0;
}
static u32 vfp_double_fneg(ARMul_State* state, int dd, int unused, int dm, u32 fpscr)
static u32 vfp_double_fneg(ARMul_State* state, int dd, [[maybe_unused]] int unused, int dm,
[[maybe_unused]] u32 fpscr)
{
LOG_TRACE(Core_ARM11, "In %s", __FUNCTION__);
vfp_put_double(state, vfp_double_packed_negate(vfp_get_double(state, dm)), dd);
return 0;
}
static u32 vfp_double_fsqrt(ARMul_State* state, int dd, int unused, int dm, u32 fpscr)
static u32 vfp_double_fsqrt(ARMul_State* state, int dd, [[maybe_unused]] int unused, int dm,
u32 fpscr)
{
LOG_TRACE(Core_ARM11, "In %s", __FUNCTION__);
vfp_double vdm, vdd, *vdp;
@ -394,7 +392,8 @@ sqrt_invalid:
* Greater than := C
* Unordered := CV
*/
static u32 vfp_compare(ARMul_State* state, int dd, int signal_on_qnan, s64 m, u32 fpscr)
static u32 vfp_compare(ARMul_State* state, int dd, int signal_on_qnan, s64 m,
[[maybe_unused]] u32 fpscr)
{
s64 d;
u32 ret = 0;
@ -458,31 +457,36 @@ static u32 vfp_compare(ARMul_State* state, int dd, int signal_on_qnan, s64 m, u3
return ret;
}
static u32 vfp_double_fcmp(ARMul_State* state, int dd, int unused, int dm, u32 fpscr)
static u32 vfp_double_fcmp(ARMul_State* state, int dd, [[maybe_unused]] int unused, int dm,
u32 fpscr)
{
LOG_TRACE(Core_ARM11, "In %s", __FUNCTION__);
return vfp_compare(state, dd, 0, vfp_get_double(state, dm), fpscr);
}
static u32 vfp_double_fcmpe(ARMul_State* state, int dd, int unused, int dm, u32 fpscr)
static u32 vfp_double_fcmpe(ARMul_State* state, int dd, [[maybe_unused]] int unused, int dm,
u32 fpscr)
{
LOG_TRACE(Core_ARM11, "In %s", __FUNCTION__);
return vfp_compare(state, dd, 1, vfp_get_double(state, dm), fpscr);
}
static u32 vfp_double_fcmpz(ARMul_State* state, int dd, int unused, int dm, u32 fpscr)
static u32 vfp_double_fcmpz(ARMul_State* state, int dd, [[maybe_unused]] int unused, [[maybe_unused]] int dm,
u32 fpscr)
{
LOG_TRACE(Core_ARM11, "In %s", __FUNCTION__);
return vfp_compare(state, dd, 0, 0, fpscr);
}
static u32 vfp_double_fcmpez(ARMul_State* state, int dd, int unused, int dm, u32 fpscr)
static u32 vfp_double_fcmpez(ARMul_State* state, int dd, [[maybe_unused]] int unused, [[maybe_unused]] int dm,
u32 fpscr)
{
LOG_TRACE(Core_ARM11, "In %s", __FUNCTION__);
return vfp_compare(state, dd, 1, 0, fpscr);
}
static u32 vfp_double_fcvts(ARMul_State* state, int sd, int unused, int dm, u32 fpscr)
static u32 vfp_double_fcvts(ARMul_State* state, int sd, [[maybe_unused]] int unused, int dm,
u32 fpscr)
{
struct vfp_double vdm;
struct vfp_single vsd;
@ -527,7 +531,8 @@ pack_nan:
return exceptions;
}
static u32 vfp_double_fuito(ARMul_State* state, int dd, int unused, int dm, u32 fpscr)
static u32 vfp_double_fuito(ARMul_State* state, int dd, [[maybe_unused]] int unused, int dm,
u32 fpscr)
{
struct vfp_double vdm;
u32 exceptions = 0;
@ -542,7 +547,8 @@ static u32 vfp_double_fuito(ARMul_State* state, int dd, int unused, int dm, u32
return exceptions;
}
static u32 vfp_double_fsito(ARMul_State* state, int dd, int unused, int dm, u32 fpscr)
static u32 vfp_double_fsito(ARMul_State* state, int dd, [[maybe_unused]] int unused, int dm,
u32 fpscr)
{
struct vfp_double vdm;
u32 exceptions = 0;
@ -557,7 +563,8 @@ static u32 vfp_double_fsito(ARMul_State* state, int dd, int unused, int dm, u32
return exceptions;
}
static u32 vfp_double_ftoui(ARMul_State* state, int sd, int unused, int dm, u32 fpscr)
static u32 vfp_double_ftoui(ARMul_State* state, int sd, [[maybe_unused]] int unused, int dm,
u32 fpscr)
{
struct vfp_double vdm;
u32 d, exceptions = 0;
@ -646,7 +653,8 @@ static u32 vfp_double_ftouiz(ARMul_State* state, int sd, int unused, int dm, u32
return vfp_double_ftoui(state, sd, unused, dm, (fpscr & ~FPSCR_RMODE_MASK) | FPSCR_ROUND_TOZERO);
}
static u32 vfp_double_ftosi(ARMul_State* state, int sd, int unused, int dm, u32 fpscr)
static u32 vfp_double_ftosi(ARMul_State* state, int sd, [[maybe_unused]] int unused, int dm,
u32 fpscr)
{
struct vfp_double vdm;
u32 d, exceptions = 0;

View file

@ -52,22 +52,14 @@
*/
#ifdef _MSC_VER
#pragma warning(disable : 4100 4244 4245)
#endif
#ifdef __GNUC__
#pragma GCC diagnostic warning "-Wunused-parameter"
#endif
#ifdef __clang__
#pragma clang diagnostic warning "-Wunused-parameter"
#pragma warning(disable : 4244 4245)
#endif
#include <algorithm>
#include <cinttypes>
#include <common/assert.h>
//#include "common/common_funcs.h"
#include "common/assert.h"
#include "common/common_types.h"
//#include "common/logging/log.h"
#include "A32/skyeye_interpreter/skyeye_common/vfp/vfp_helper.h"
#include "A32/skyeye_interpreter/skyeye_common/vfp/asm_vfp.h"
@ -83,7 +75,7 @@ static struct vfp_single vfp_single_default_qnan = {
VFP_SINGLE_SIGNIFICAND_QNAN,
};
static void vfp_single_dump(const char *str, struct vfp_single *s)
static void vfp_single_dump([[maybe_unused]] const char *str, [[maybe_unused]] vfp_single *s)
{
LOG_TRACE(Core_ARM11, "%s: sign=%d exponent=%d significand=%08x",
str, s->sign != 0, s->exponent, s->significand);
@ -104,7 +96,8 @@ static void vfp_single_normalise_denormal(struct vfp_single *vs)
}
u32 vfp_single_normaliseround(ARMul_State* state, int sd, struct vfp_single *vs, u32 fpscr, const char *func)
u32 vfp_single_normaliseround(ARMul_State* state, int sd, vfp_single *vs, u32 fpscr,
[[maybe_unused]] const char *func)
{
u32 significand, incr, rmode;
int exponent, shift, underflow;
@ -289,19 +282,22 @@ vfp_propagate_nan(struct vfp_single *vsd, struct vfp_single *vsn,
/*
* Extended operations
*/
static u32 vfp_single_fabs(ARMul_State* state, int sd, int unused, s32 m, u32 fpscr)
static u32 vfp_single_fabs(ARMul_State* state, int sd, [[maybe_unused]] int unused, s32 m,
[[maybe_unused]] u32 fpscr)
{
vfp_put_float(state, vfp_single_packed_abs(m), sd);
return 0;
}
static u32 vfp_single_fcpy(ARMul_State* state, int sd, int unused, s32 m, u32 fpscr)
static u32 vfp_single_fcpy(ARMul_State* state, int sd, [[maybe_unused]] int unused, s32 m,
[[maybe_unused]] u32 fpscr)
{
vfp_put_float(state, m, sd);
return 0;
}
static u32 vfp_single_fneg(ARMul_State* state, int sd, int unused, s32 m, u32 fpscr)
static u32 vfp_single_fneg(ARMul_State* state, int sd, [[maybe_unused]] int unused, s32 m,
[[maybe_unused]] u32 fpscr)
{
vfp_put_float(state, vfp_single_packed_negate(m), sd);
return 0;
@ -346,7 +342,8 @@ u32 vfp_estimate_sqrt_significand(u32 exponent, u32 significand)
}
}
static u32 vfp_single_fsqrt(ARMul_State* state, int sd, int unused, s32 m, u32 fpscr)
static u32 vfp_single_fsqrt(ARMul_State* state, int sd, [[maybe_unused]] int unused, s32 m,
u32 fpscr)
{
struct vfp_single vsm, vsd, *vsp;
int ret, tm;
@ -435,7 +432,8 @@ sqrt_invalid:
* Greater than := C
* Unordered := CV
*/
static u32 vfp_compare(ARMul_State* state, int sd, int signal_on_qnan, s32 m, u32 fpscr)
static u32 vfp_compare(ARMul_State* state, int sd, int signal_on_qnan, s32 m,
[[maybe_unused]] u32 fpscr)
{
s32 d;
u32 ret = 0;
@ -494,27 +492,32 @@ static u32 vfp_compare(ARMul_State* state, int sd, int signal_on_qnan, s32 m, u3
return ret;
}
static u32 vfp_single_fcmp(ARMul_State* state, int sd, int unused, s32 m, u32 fpscr)
static u32 vfp_single_fcmp(ARMul_State* state, int sd, [[maybe_unused]] int unused, s32 m,
u32 fpscr)
{
return vfp_compare(state, sd, 0, m, fpscr);
}
static u32 vfp_single_fcmpe(ARMul_State* state, int sd, int unused, s32 m, u32 fpscr)
static u32 vfp_single_fcmpe(ARMul_State* state, int sd, [[maybe_unused]] int unused, s32 m,
u32 fpscr)
{
return vfp_compare(state, sd, 1, m, fpscr);
}
static u32 vfp_single_fcmpz(ARMul_State* state, int sd, int unused, s32 m, u32 fpscr)
static u32 vfp_single_fcmpz(ARMul_State* state, int sd, [[maybe_unused]] int unused,
[[maybe_unused]] s32 m, u32 fpscr)
{
return vfp_compare(state, sd, 0, 0, fpscr);
}
static u32 vfp_single_fcmpez(ARMul_State* state, int sd, int unused, s32 m, u32 fpscr)
static u32 vfp_single_fcmpez(ARMul_State* state, int sd, [[maybe_unused]] int unused,
[[maybe_unused]] s32 m, u32 fpscr)
{
return vfp_compare(state, sd, 1, 0, fpscr);
}
static u32 vfp_single_fcvtd(ARMul_State* state, int dd, int unused, s32 m, u32 fpscr)
static u32 vfp_single_fcvtd(ARMul_State* state, int dd, [[maybe_unused]] int unused, s32 m,
u32 fpscr)
{
struct vfp_single vsm;
struct vfp_double vdd;
@ -558,7 +561,8 @@ pack_nan:
return exceptions;
}
static u32 vfp_single_fuito(ARMul_State* state, int sd, int unused, s32 m, u32 fpscr)
static u32 vfp_single_fuito(ARMul_State* state, int sd, [[maybe_unused]] int unused, s32 m,
u32 fpscr)
{
struct vfp_single vs;
u32 exceptions = 0;
@ -571,7 +575,8 @@ static u32 vfp_single_fuito(ARMul_State* state, int sd, int unused, s32 m, u32 f
return exceptions;
}
static u32 vfp_single_fsito(ARMul_State* state, int sd, int unused, s32 m, u32 fpscr)
static u32 vfp_single_fsito(ARMul_State* state, int sd, [[maybe_unused]] int unused, s32 m,
u32 fpscr)
{
struct vfp_single vs;
u32 exceptions = 0;
@ -584,7 +589,8 @@ static u32 vfp_single_fsito(ARMul_State* state, int sd, int unused, s32 m, u32 f
return exceptions;
}
static u32 vfp_single_ftoui(ARMul_State* state, int sd, int unused, s32 m, u32 fpscr)
static u32 vfp_single_ftoui(ARMul_State* state, int sd, [[maybe_unused]] int unused, s32 m,
u32 fpscr)
{
struct vfp_single vsm;
u32 d, exceptions = 0;
@ -676,7 +682,8 @@ static u32 vfp_single_ftouiz(ARMul_State* state, int sd, int unused, s32 m, u32
return vfp_single_ftoui(state, sd, unused, m, (fpscr & ~FPSCR_RMODE_MASK) | FPSCR_ROUND_TOZERO);
}
static u32 vfp_single_ftosi(ARMul_State* state, int sd, int unused, s32 m, u32 fpscr)
static u32 vfp_single_ftosi(ARMul_State* state, int sd, [[maybe_unused]] int unused, s32 m,
u32 fpscr)
{
struct vfp_single vsm;
u32 d, exceptions = 0;
@ -1293,8 +1300,6 @@ u32 vfp_single_cpdo(ARMul_State* state, u32 inst, u32 fpscr)
(veclen >> FPSCR_LENGTH_BIT) + 1);
if (!fop->fn) {
// LOG_CRITICAL(Core_ARM11, "could not find single op %d, inst=0x%x@0x%x", FEXT_TO_IDX(inst), inst, state->Reg[15]);
// Crash();
ASSERT_MSG(false, "could not find single op {}, inst=0x{:08x}@0x{:08x}", FEXT_TO_IDX(inst), inst, state->Reg[15]);
goto invalid;
}
@ -1302,9 +1307,7 @@ u32 vfp_single_cpdo(ARMul_State* state, u32 inst, u32 fpscr)
for (vecitr = 0; vecitr <= veclen; vecitr += 1 << FPSCR_LENGTH_BIT) {
s32 m = vfp_get_float(state, sm);
u32 except;
// char type;
// type = (fop->flags & OP_DD) ? 'd' : 's';
if (op == FOP_EXT)
LOG_TRACE(Core_ARM11, "itr%d (%c%u) = op[%u] (s%u=%08x)",
vecitr >> FPSCR_LENGTH_BIT, type, dest, sn,