Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-14 08:17:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
Justin Ethier 2017-03-30 17:58:39 -04:00
parent f8bbff4ebb
commit ffb9fd9e22
1 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
srfi/60.scm
View file

@ -134,12 +134,12 @@
(define-c bitwise-if (define-c bitwise-if
"(void* data, int argc, closure _, object k, "(void* data, int argc, closure _, object k,
object mask, object n0, object n1)" object mask, object n0, object n1)"
"Cyc_check_int(data, mask); "Cyc_check_fixnum(data, mask); // TODO: bignum support
Cyc_check_int(data, n0); Cyc_check_fixnum(data, n0);
Cyc_check_int(data, n1); Cyc_check_fixnum(data, n1);
int m = unbox_number(mask); int m = unbox_number(mask);
int result = (m & ((int)unbox_number(n0))) | ((~m) & ((int)unbox_number(n1))); int result = (m & ((int)unbox_number(n0))) | ((~m) & ((int)unbox_number(n1)));
return_closcall1(data, k, obj_int2obj(result));") return_closcall1(data, k, obj_int2obj(result));")
(define bitwise-merge bitwise-if) (define bitwise-merge bitwise-if)
@ -206,20 +206,25 @@
(define-c ash (define-c ash
"(void* data, int argc, closure _, object k, object x, object y)" "(void* data, int argc, closure _, object k, object x, object y)"
"Cyc_check_int(data, x); "Cyc_check_int(data, x);
Cyc_check_int(data,y); Cyc_check_int(data,y);
int bf = (int)unbox_number(x); int bf = (int)unbox_number(x);
int shift = (int)unbox_number(y); int shift = (int)unbox_number(y);
int i; //int i;
if (shift > 0) { if (shift > 0) {
for (i = 0; i < shift; i++) { bf <<= shift;
bf *= 2; } else {
} bf >>= abs(shift);
} else { }
for (i = 0; i < abs(shift); i++) { // if (shift > 0) {
bf /= 2; // for (i = 0; i < shift; i++) {
} // bf *= 2;
} // }
return_closcall1(data, k, obj_int2obj(bf))") // } else {
// for (i = 0; i < abs(shift); i++) {
// bf /= 2;
// }
// }
return_closcall1(data, k, obj_int2obj(bf))")
(define arithmetic-shift ash) (define arithmetic-shift ash)