rokicki
commented
1 year ago What platform were you building on and what version of gcc?
On Wed, Nov 8, 2023 at 1:00 PM DougCube @.***> wrote:
When building with GCC (latest version), there were 11 instances in the codebase where I had to make this change to let it go thru, perhaps there's some way to adjust the code so this is not needed, like with some preprocessor macro detecting which compiler is being used.
Or that there is some option for GCC I'm not aware of and the makefile could be adjusted to pass it an option that would take care of this.
diff --git a/src/cpp/ffi/ffi_api.cpp b/src/cpp/ffi/ffi_api.cpp index 9e44f72..e6a388f 100644 --- a/src/cpp/ffi/ffi_api.cpp +++ b/src/cpp/ffi/ffi_api.cpp @@ -47,14 +47,14 @@ void ffi_api_set_arg(string s) { while (space < (int)s.size() && s[space] != ' ') space++; if (space >= (int)s.size()) {
- argv[1] = strdup(s.c_str());
- argv[1] = __builtin_strdup(s.c_str()); argv[2] = 0; argc = 2; } else { scopy = s; scopy[space] = 0;
- argv[1] = strdup(scopy.c_str());
- argv[2] = strdup(scopy.c_str() + space + 1);
- argv[1] = __builtin_strdup(scopy.c_str());
- argv[2] = __builtin_strdup(scopy.c_str() + space + 1); argv[3] = 0; argc = 3; } diff --git a/src/cpp/god.cpp b/src/cpp/god.cpp index 85a60bb..4bcbf1c 100644 --- a/src/cpp/god.cpp +++ b/src/cpp/god.cpp @@ -46,7 +46,7 @@ void dotwobitgod(puzdef &pd) { checkv = (checkv & 0x5555555555555555LL) & ((checkv >> 1) & 0x5555555555555555LL);
ifdef HAVE_FFSLL
- for (int smi = ffsll(checkv); checkv; smi = ffsll(checkv)) {
- for (int smi = __builtin_ffsll(checkv); checkv; smi = __builtin_ffsll(checkv)) {
else
for (int smi = 1; checkv; smi++) { if (0 == ((checkv >> (smi - 1)) & 1))@@ -78,7 +78,7 @@ void dotwobitgod(puzdef &pd) { checkv = (checkv & 0x5555555555555555LL) & ((checkv >> 1) & 0x5555555555555555LL);
ifdef HAVE_FFSLL
- for (int smi = ffsll(checkv); checkv; smi = ffsll(checkv)) {
- for (int smi = __builtin_ffsll(checkv); checkv; smi = __builtin_ffsll(checkv)) {
else
for (int smi = 1; checkv; smi++) { if (0 == ((checkv >> (smi - 1)) & 1))diff --git a/src/cpp/puzdef.h b/src/cpp/puzdef.h index a242dbf..94cd2ba 100644 --- a/src/cpp/puzdef.h +++ b/src/cpp/puzdef.h @@ -232,12 +232,12 @@ struct puzdef { for (int o = 1; o < setdefs[0].size; o++) { if ((r & (r - 1)) == 0) return r;
- int t = ffsll(r) - 1;
- int t = __builtin_ffsll(r) - 1; ull r2 = 1LL << t; int rv = rotinvmap[t].dat[bp[rotgroup[t].pos.dat[o]]]; r &= ~(1LL << t); while (r) {
- int m = ffsll(r) - 1;
- int m = __builtin_ffsll(r) - 1; r &= ~(1LL << m); t = rotinvmap[m].dat[bp[rotgroup[m].pos.dat[o]]]; if (t < rv) { diff --git a/src/cpp/rotations.cpp b/src/cpp/rotations.cpp index 77ca971..d57239c 100644 --- a/src/cpp/rotations.cpp +++ b/src/cpp/rotations.cpp @@ -295,11 +295,11 @@ int slowmodm2(const puzdef &pd, const setval p1, setval p2) { int cnt = 1; if (pd.rotgroup.size() <= 64) { ull lobits = pd.lowsymmbits(p1);
- int g = ffsll(lobits) - 1;
- int g = __builtin_ffsll(lobits) - 1; pd.mul3(pd.rotinvmap[g], p1, pd.rotgroup[g].pos, p2); lobits &= ~(1LL << g); while (lobits) {
- g = ffsll(lobits) - 1;
- g = __builtin_ffsll(lobits) - 1; lobits &= ~(1LL << g); int t = pd.mulcmp3(pd.rotinvmap[g], p1, pd.rotgroup[g].pos, p2); if (t <= 0) {
— Reply to this email directly, view it on GitHub https://github.com/cubing/twsearch/issues/41, or unsubscribe https://github.com/notifications/unsubscribe-auth/AAMOLSZWLBLANQMN632PLWLYDPXGTAVCNFSM6AAAAAA7DQNNP6VHI2DSMVQWIX3LMV43ASLTON2WKOZRHE4DIMZYHE4DGNY . You are receiving this because you are subscribed to this thread.Message ID: @.***>
--
DougCube
When building with GCC (latest version), there were 11 instances in the codebase where I had to make this change to let it go thru, perhaps there's some way to adjust the code so this is not needed, like with some preprocessor macro detecting which compiler is being used.
Or that there is some option for GCC I'm not aware of and the makefile could be adjusted to pass it an option that would take care of this.