TakeV
/
dxx-rebirth
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove quadint members low, high 

Always access the data through the member `q`.  This makes the code
independent of architecture endian decisions.
This commit is contained in:
Kp 2022-05-24 02:32:58 +00:00
parent e154d37e5e
commit d8ab3c9bd3
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/include/maths.h
View File

@ -37,13 +37,7 @@ typedef int16_t fixang; //angles
typedef struct quadint // integer 64 bit, previously called "quad"
{
union {
struct {
uint32_t low;
int32_t high;
};
int64_t q;
};
}
quadint;
@ -132,12 +126,6 @@ static inline fix fixquadadjust (const quadint *q)
return static_cast<fix>(q->q >> 16);
}
//negate a quadint
static inline void fixquadnegate (quadint * q)
{
q->q = -q->q;
}
//computes the square root of a long, returning a short
[[nodiscard]]
ushort long_sqrt (int32_t a);
@ -188,7 +176,7 @@ fixang fix_atan2 (fix cos, fix sin);
[[nodiscard]]
std::optional<int32_t> checkmuldiv(fix a, fix b, fix divisor);
extern const std::array<ubyte, 256> guess_table;
extern const std::array<uint8_t, 256> guess_table;
extern const std::array<int16_t, 256> sincos_table;
extern const std::array<ushort, 258> asin_table;
extern const std::array<ushort, 258> acos_table;

4
common/maths/fixc.cpp
View File

@ -105,8 +105,8 @@ static unsigned fixdivquadlongu(quadint n, uint64_t d)
uint32_t quad_sqrt(const quadint iq)
{
const uint32_t low = iq.low;
const int32_t high = iq.high;
const uint32_t low = static_cast<uint32_t>(iq.q);
const int32_t high = static_cast<int32_t>(iq.q >> 32);
int i, cnt;
uint32_t r,old_r,t;

2
common/maths/tables.cpp
View File

@ -15,7 +15,7 @@
namespace dcx {
const std::array<ubyte, 256> guess_table{{
constexpr std::array<uint8_t, 256> guess_table{{
1,
1,1,1,
2,2,2,2,2,