thunderbrewhq/squall
1
0
Fork 0
mirror of https://github.com/thunderbrewhq/squall.git synced 2025-12-12 02:22:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore(big): style and warning fixes

Browse source
This commit is contained in:
Adam Heinermann 2024-11-17 02:10:24 -08:00 • committed by superp00t
parent c616d351a9
commit 8e96181679
7 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storm/Big.cpp
View file

@ -46,7 +46,7 @@ void SBigDel(BigData* num) {
void SBigDiv(BigData* a, BigData* b, BigData* c) { void SBigDiv(BigData* a, BigData* b, BigData* c) {
uint32_t allocCount = 0; uint32_t allocCount = 0;
BigBuffer &buf = a->Stack().Alloc(&allocCount); BigBuffer& buf = a->Stack().Alloc(&allocCount);
Div(a->Primary(), buf, b->Primary(), c->Primary(), a->Stack()); Div(a->Primary(), buf, b->Primary(), c->Primary(), a->Stack());

20
storm/big/Ops.cpp
View file

@ -52,12 +52,12 @@ void Div(BigBuffer& a, uint32_t* b, const BigBuffer& c, uint64_t d) {
uint64_t data = 0; uint64_t data = 0;
while (index > 0) { while (index > 0) {
InsertLowPart(data, c[--index]); InsertLowPart(data, c[--index]);
a[index] = data / d; a[index] = static_cast<uint32_t>(data / d);
data %= d; data %= d;
} }
a.Trim(); a.Trim();
*b = data; *b = static_cast<uint32_t>(data);
} }
void Div(BigBuffer& a, BigBuffer& b, const BigBuffer& c, const BigBuffer& d, BigStack& stack) { void Div(BigBuffer& a, BigBuffer& b, const BigBuffer& c, const BigBuffer& d, BigStack& stack) {
@ -102,7 +102,7 @@ void Div(BigBuffer& a, BigBuffer& b, const BigBuffer& c, const BigBuffer& d, Big
cc.SetOffset(v12 - 1); cc.SetOffset(v12 - 1);
if (t) { if (t) {
a[0] = MakeLarge(cc[dCount - 1], cc[dCount]) / t; a[0] = static_cast<uint32_t>(MakeLarge(cc[dCount - 1], cc[dCount]) / t);
} else { } else {
a[0] = cc[dCount]; a[0] = cc[dCount];
} }
@ -211,21 +211,21 @@ void InsertLowPart(uint64_t& value, uint32_t low) {
value = (value << 32) | low; value = (value << 32) | low;
} }
int32_t IsEven(const BigBuffer &num) { int32_t IsEven(const BigBuffer& num) {
return num.Count() == 0 || (num[0] & 1) == 0; return num.Count() == 0 || (num[0] & 1) == 0;
} }
int32_t IsOdd(const BigBuffer &num) { int32_t IsOdd(const BigBuffer& num) {
num.Trim(); num.Trim();
return num.Count() != 0 && (num[0] & 1) != 0; return num.Count() != 0 && (num[0] & 1) != 0;
} }
int32_t IsOne(const BigBuffer &num) { int32_t IsOne(const BigBuffer& num) {
num.Trim(); num.Trim();
return num.Count() == 1 && num[0] == 1; return num.Count() == 1 && num[0] == 1;
} }
int32_t IsZero(const BigBuffer &num) { int32_t IsZero(const BigBuffer& num) {
num.Trim(); num.Trim();
return num.Count() == 0; return num.Count() == 0;
} }
@ -437,8 +437,7 @@ void Sub(BigBuffer& a, const BigBuffer& b, const BigBuffer& c) {
} }
a.SetCount(i); a.SetCount(i);
// This assert does not exist in retail WoW or Starcraft. STORM_ASSERT(!borrow);
//STORM_ASSERT(!borrow);
} }
void Sub(BigBuffer& a, const BigBuffer& b, uint32_t c) { void Sub(BigBuffer& a, const BigBuffer& b, uint32_t c) {
@ -451,8 +450,7 @@ void Sub(BigBuffer& a, const BigBuffer& b, uint32_t c) {
} }
a.SetCount(i); a.SetCount(i);
// This assert does not exist in retail WoW or Starcraft. STORM_ASSERT(!borrow);
//STORM_ASSERT(!borrow);
} }
void ToBinaryAppend(TSGrowableArray<uint8_t>& output, const BigBuffer& buffer) { void ToBinaryAppend(TSGrowableArray<uint8_t>& output, const BigBuffer& buffer) {

8
storm/big/Ops.hpp
View file

@ -33,13 +33,13 @@ uint32_t HighBitPos(const BigBuffer& buffer);
void InsertLowPart(uint64_t& value, uint32_t low); void InsertLowPart(uint64_t& value, uint32_t low);
int32_t IsEven(const BigBuffer &num); int32_t IsEven(const BigBuffer& num);
int32_t IsOdd(const BigBuffer &num); int32_t IsOdd(const BigBuffer& num);
int32_t IsOne(const BigBuffer &num); int32_t IsOne(const BigBuffer& num);
int32_t IsZero(const BigBuffer &num); int32_t IsZero(const BigBuffer& num);
uint64_t MakeLarge(uint32_t low, uint32_t high); uint64_t MakeLarge(uint32_t low, uint32_t high);

4
storm/thread/win/S_Thread.cpp
View file

@ -1,10 +1,6 @@
#include "storm/thread/S_Thread.hpp" #include "storm/thread/S_Thread.hpp"
#include "storm/Memory.hpp" #include "storm/Memory.hpp"
#ifndef WINAPI
#define WINAPI
#endif
DWORD WINAPI S_Thread::s_SLaunchThread(void* threadParam) { DWORD WINAPI S_Thread::s_SLaunchThread(void* threadParam) {
auto params = static_cast<SThreadParmBlock*>(threadParam); auto params = static_cast<SThreadParmBlock*>(threadParam);
auto proc = params->threadProc; auto proc = params->threadProc;

8
test/Big.cpp
View file

@ -171,6 +171,7 @@ TEST_CASE("SBigDec", "[big]") {
CHECK(a->Primary()[0] == 4); CHECK(a->Primary()[0] == 4);
} }
#ifdef NDEBUG
SECTION("decrements from 0") { SECTION("decrements from 0") {
SBigFromUnsigned(b, 0); SBigFromUnsigned(b, 0);
@ -179,6 +180,7 @@ TEST_CASE("SBigDec", "[big]") {
CHECK(a->Primary().Count() == 1); CHECK(a->Primary().Count() == 1);
CHECK(a->Primary()[0] == 0xFFFFFFFF); CHECK(a->Primary()[0] == 0xFFFFFFFF);
} }
#endif
} }
TEST_CASE("SBigDiv", "[big]") { TEST_CASE("SBigDiv", "[big]") {
@ -611,8 +613,8 @@ TEST_CASE("SBigOr", "[big]") {
SBigOr(a, b, c); SBigOr(a, b, c);
CHECK(a->Primary().Count() == 2); CHECK(a->Primary().Count() == 2);
CHECK(a->Primary()[0] == uint32_t(v.first | v.second)); CHECK(a->Primary()[0] == 0xFFFFFFFF);
CHECK(a->Primary()[1] == uint32_t((v.first | v.second) >> 32)); CHECK(a->Primary()[1] == 0xFFFFFFFF);
} }
SECTION("performs bitwise or on huge value") { SECTION("performs bitwise or on huge value") {
@ -694,6 +696,7 @@ TEST_CASE("SBigSub", "[big]") {
CHECK(a->Primary()[0] == 1); CHECK(a->Primary()[0] == 1);
} }
#ifdef NDEBUG
SECTION("subtracts 1 from 0") { SECTION("subtracts 1 from 0") {
SBigFromUnsigned(b, 0); SBigFromUnsigned(b, 0);
SBigFromUnsigned(c, 1); SBigFromUnsigned(c, 1);
@ -703,6 +706,7 @@ TEST_CASE("SBigSub", "[big]") {
CHECK(a->Primary().Count() == 1); CHECK(a->Primary().Count() == 1);
CHECK(a->Primary()[0] == 0xFFFFFFFF); CHECK(a->Primary()[0] == 0xFFFFFFFF);
} }
#endif
} }
TEST_CASE("SBigToBinaryBuffer", "[big]") { TEST_CASE("SBigToBinaryBuffer", "[big]") {

8
test/Test.hpp
View file

@ -4,14 +4,14 @@ class BigData;
// Fixture for repetitive handling of BigData objects. // Fixture for repetitive handling of BigData objects.
struct BigDataTest { struct BigDataTest {
using BigDataPtr=BigData*; using BigDataPtr = BigData*;
BigData *num; BigData* num;
BigDataTest(); BigDataTest();
~BigDataTest(); ~BigDataTest();
BigData **operator &() { return &num; } BigData** operator &() { return &num; }
operator BigDataPtr() const { return num; } operator BigDataPtr() const { return num; }
BigData *operator->() const { return num; } BigData* operator->() const { return num; }
}; };

2
test/big/Ops.cpp
View file

@ -970,6 +970,7 @@ TEST_CASE("Sub", "[big]") {
CHECK(a->Primary()[0] == 1); CHECK(a->Primary()[0] == 1);
} }
#ifdef NDEBUG
SECTION("subtracts 1 from 0") { SECTION("subtracts 1 from 0") {
SBigFromUnsigned(b, 0); SBigFromUnsigned(b, 0);
SBigFromUnsigned(c, 1); SBigFromUnsigned(c, 1);
@ -988,6 +989,7 @@ TEST_CASE("Sub", "[big]") {
CHECK(a->Primary().Count() == 1); CHECK(a->Primary().Count() == 1);
CHECK(a->Primary()[0] == 0xFFFFFFFF); CHECK(a->Primary()[0] == 0xFFFFFFFF);
} }
#endif
SECTION("subtracts 1 from 2") { SECTION("subtracts 1 from 2") {
SBigFromUnsigned(b, 2); SBigFromUnsigned(b, 2);