VM: Refactor math.hpp/cpp to Factor style
Erik Charlebois
parent
38802ce173
commit
d9e225e1dc
616
vm/math.cpp
616
vm/math.cpp
|
|
@ -1,516 +1,430 @@
|
||||||
#include "master.hpp"
|
#include "master.hpp"
|
||||||
|
|
||||||
namespace factor
|
namespace factor {
|
||||||
{
|
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_to_fixnum()
|
void factor_vm::primitive_bignum_to_fixnum() {
|
||||||
{
|
ctx->replace(tag_fixnum(bignum_to_fixnum(untag<bignum>(ctx->peek()))));
|
||||||
ctx->replace(tag_fixnum(bignum_to_fixnum(untag<bignum>(ctx->peek()))));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_float_to_fixnum()
|
void factor_vm::primitive_float_to_fixnum() {
|
||||||
{
|
ctx->replace(tag_fixnum(float_to_fixnum(ctx->peek())));
|
||||||
ctx->replace(tag_fixnum(float_to_fixnum(ctx->peek())));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* does not allocate, even though from_signed_cell can allocate */
|
/* does not allocate, even though from_signed_cell can allocate */
|
||||||
/* Division can only overflow when we are dividing the most negative fixnum
|
/* Division can only overflow when we are dividing the most negative fixnum
|
||||||
by -1. */
|
by -1. */
|
||||||
void factor_vm::primitive_fixnum_divint()
|
void factor_vm::primitive_fixnum_divint() {
|
||||||
{
|
fixnum y = untag_fixnum(ctx->pop());
|
||||||
fixnum y = untag_fixnum(ctx->pop());
|
fixnum x = untag_fixnum(ctx->peek());
|
||||||
fixnum x = untag_fixnum(ctx->peek());
|
fixnum result = x / y;
|
||||||
fixnum result = x / y;
|
if (result == -fixnum_min)
|
||||||
if(result == -fixnum_min)
|
/* Does not allocate */
|
||||||
/* Does not allocate */
|
ctx->replace(from_signed_cell(-fixnum_min));
|
||||||
ctx->replace(from_signed_cell(-fixnum_min));
|
else
|
||||||
else
|
ctx->replace(tag_fixnum(result));
|
||||||
ctx->replace(tag_fixnum(result));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* does not allocate, even though from_signed_cell can allocate */
|
/* does not allocate, even though from_signed_cell can allocate */
|
||||||
void factor_vm::primitive_fixnum_divmod()
|
void factor_vm::primitive_fixnum_divmod() {
|
||||||
{
|
cell* s0 = (cell*)(ctx->datastack);
|
||||||
cell *s0 = (cell *)(ctx->datastack);
|
cell* s1 = (cell*)(ctx->datastack - sizeof(cell));
|
||||||
cell *s1 = (cell *)(ctx->datastack - sizeof(cell));
|
fixnum y = untag_fixnum(*s0);
|
||||||
fixnum y = untag_fixnum(*s0);
|
fixnum x = untag_fixnum(*s1);
|
||||||
fixnum x = untag_fixnum(*s1);
|
if (y == -1 && x == fixnum_min) {
|
||||||
if(y == -1 && x == fixnum_min)
|
/* Does not allocate */
|
||||||
{
|
*s1 = from_signed_cell(-fixnum_min);
|
||||||
/* Does not allocate */
|
*s0 = tag_fixnum(0);
|
||||||
*s1 = from_signed_cell(-fixnum_min);
|
} else {
|
||||||
*s0 = tag_fixnum(0);
|
*s1 = tag_fixnum(x / y);
|
||||||
}
|
*s0 = tag_fixnum(x % y);
|
||||||
else
|
}
|
||||||
{
|
|
||||||
*s1 = tag_fixnum(x / y);
|
|
||||||
*s0 = tag_fixnum(x % y);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* If we're shifting right by n bits, we won't overflow as long as none of the
|
* If we're shifting right by n bits, we won't overflow as long as none of the
|
||||||
* high WORD_SIZE-TAG_BITS-n bits are set.
|
* high WORD_SIZE-TAG_BITS-n bits are set.
|
||||||
*/
|
*/
|
||||||
inline fixnum factor_vm::sign_mask(fixnum x)
|
inline fixnum factor_vm::sign_mask(fixnum x) { return x >> (WORD_SIZE - 1); }
|
||||||
{
|
|
||||||
return x >> (WORD_SIZE - 1);
|
inline fixnum factor_vm::branchless_max(fixnum x, fixnum y) {
|
||||||
|
return (x - ((x - y) & sign_mask(x - y)));
|
||||||
}
|
}
|
||||||
|
|
||||||
inline fixnum factor_vm::branchless_max(fixnum x, fixnum y)
|
inline fixnum factor_vm::branchless_abs(fixnum x) {
|
||||||
{
|
return (x ^ sign_mask(x)) - sign_mask(x);
|
||||||
return (x - ((x - y) & sign_mask(x - y)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
inline fixnum factor_vm::branchless_abs(fixnum x)
|
void factor_vm::primitive_fixnum_shift() {
|
||||||
{
|
fixnum y = untag_fixnum(ctx->pop());
|
||||||
return (x ^ sign_mask(x)) - sign_mask(x);
|
fixnum x = untag_fixnum(ctx->peek());
|
||||||
|
|
||||||
|
if (x == 0)
|
||||||
|
return;
|
||||||
|
else if (y < 0) {
|
||||||
|
y = branchless_max(y, -WORD_SIZE + 1);
|
||||||
|
ctx->replace(tag_fixnum(x >> -y));
|
||||||
|
return;
|
||||||
|
} else if (y < WORD_SIZE - TAG_BITS) {
|
||||||
|
fixnum mask = -((fixnum) 1 << (WORD_SIZE - 1 - TAG_BITS - y));
|
||||||
|
if (!(branchless_abs(x) & mask)) {
|
||||||
|
ctx->replace(tag_fixnum(x << y));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx->replace(tag<bignum>(bignum_arithmetic_shift(fixnum_to_bignum(x), y)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_fixnum_shift()
|
void factor_vm::primitive_fixnum_to_bignum() {
|
||||||
{
|
ctx->replace(tag<bignum>(fixnum_to_bignum(untag_fixnum(ctx->peek()))));
|
||||||
fixnum y = untag_fixnum(ctx->pop());
|
|
||||||
fixnum x = untag_fixnum(ctx->peek());
|
|
||||||
|
|
||||||
if(x == 0)
|
|
||||||
return;
|
|
||||||
else if(y < 0)
|
|
||||||
{
|
|
||||||
y = branchless_max(y,-WORD_SIZE + 1);
|
|
||||||
ctx->replace(tag_fixnum(x >> -y));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
else if(y < WORD_SIZE - TAG_BITS)
|
|
||||||
{
|
|
||||||
fixnum mask = -((fixnum)1 << (WORD_SIZE - 1 - TAG_BITS - y));
|
|
||||||
if(!(branchless_abs(x) & mask))
|
|
||||||
{
|
|
||||||
ctx->replace(tag_fixnum(x << y));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ctx->replace(tag<bignum>(bignum_arithmetic_shift(
|
|
||||||
fixnum_to_bignum(x),y)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_fixnum_to_bignum()
|
void factor_vm::primitive_float_to_bignum() {
|
||||||
{
|
ctx->replace(tag<bignum>(float_to_bignum(ctx->peek())));
|
||||||
ctx->replace(tag<bignum>(fixnum_to_bignum(untag_fixnum(ctx->peek()))));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_float_to_bignum()
|
#define POP_BIGNUMS(x, y) \
|
||||||
{
|
bignum* y = untag<bignum>(ctx->pop()); \
|
||||||
ctx->replace(tag<bignum>(float_to_bignum(ctx->peek())));
|
bignum* x = untag<bignum>(ctx->peek());
|
||||||
|
|
||||||
|
void factor_vm::primitive_bignum_eq() {
|
||||||
|
POP_BIGNUMS(x, y);
|
||||||
|
ctx->replace(tag_boolean(bignum_equal_p(x, y)));
|
||||||
}
|
}
|
||||||
|
|
||||||
#define POP_BIGNUMS(x,y) \
|
void factor_vm::primitive_bignum_add() {
|
||||||
bignum * y = untag<bignum>(ctx->pop()); \
|
POP_BIGNUMS(x, y);
|
||||||
bignum * x = untag<bignum>(ctx->peek());
|
ctx->replace(tag<bignum>(bignum_add(x, y)));
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_eq()
|
|
||||||
{
|
|
||||||
POP_BIGNUMS(x,y);
|
|
||||||
ctx->replace(tag_boolean(bignum_equal_p(x,y)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_add()
|
void factor_vm::primitive_bignum_subtract() {
|
||||||
{
|
POP_BIGNUMS(x, y);
|
||||||
POP_BIGNUMS(x,y);
|
ctx->replace(tag<bignum>(bignum_subtract(x, y)));
|
||||||
ctx->replace(tag<bignum>(bignum_add(x,y)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_subtract()
|
void factor_vm::primitive_bignum_multiply() {
|
||||||
{
|
POP_BIGNUMS(x, y);
|
||||||
POP_BIGNUMS(x,y);
|
ctx->replace(tag<bignum>(bignum_multiply(x, y)));
|
||||||
ctx->replace(tag<bignum>(bignum_subtract(x,y)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_multiply()
|
void factor_vm::primitive_bignum_divint() {
|
||||||
{
|
POP_BIGNUMS(x, y);
|
||||||
POP_BIGNUMS(x,y);
|
ctx->replace(tag<bignum>(bignum_quotient(x, y)));
|
||||||
ctx->replace(tag<bignum>(bignum_multiply(x,y)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_divint()
|
void factor_vm::primitive_bignum_divmod() {
|
||||||
{
|
cell* s0 = (cell*)(ctx->datastack);
|
||||||
POP_BIGNUMS(x,y);
|
cell* s1 = (cell*)(ctx->datastack - sizeof(cell));
|
||||||
ctx->replace(tag<bignum>(bignum_quotient(x,y)));
|
bignum* y = untag<bignum>(*s0);
|
||||||
|
bignum* x = untag<bignum>(*s1);
|
||||||
|
bignum* q, *r;
|
||||||
|
bignum_divide(x, y, &q, &r);
|
||||||
|
*s1 = tag<bignum>(q);
|
||||||
|
*s0 = tag<bignum>(r);
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_divmod()
|
void factor_vm::primitive_bignum_mod() {
|
||||||
{
|
POP_BIGNUMS(x, y);
|
||||||
cell *s0 = (cell *)(ctx->datastack);
|
ctx->replace(tag<bignum>(bignum_remainder(x, y)));
|
||||||
cell *s1 = (cell *)(ctx->datastack - sizeof(cell));
|
|
||||||
bignum *y = untag<bignum>(*s0);
|
|
||||||
bignum *x = untag<bignum>(*s1);
|
|
||||||
bignum *q, *r;
|
|
||||||
bignum_divide(x, y, &q, &r);
|
|
||||||
*s1 = tag<bignum>(q);
|
|
||||||
*s0 = tag<bignum>(r);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_mod()
|
void factor_vm::primitive_bignum_gcd() {
|
||||||
{
|
POP_BIGNUMS(x, y);
|
||||||
POP_BIGNUMS(x,y);
|
ctx->replace(tag<bignum>(bignum_gcd(x, y)));
|
||||||
ctx->replace(tag<bignum>(bignum_remainder(x,y)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_gcd()
|
void factor_vm::primitive_bignum_and() {
|
||||||
{
|
POP_BIGNUMS(x, y);
|
||||||
POP_BIGNUMS(x,y);
|
ctx->replace(tag<bignum>(bignum_bitwise_and(x, y)));
|
||||||
ctx->replace(tag<bignum>(bignum_gcd(x,y)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_and()
|
void factor_vm::primitive_bignum_or() {
|
||||||
{
|
POP_BIGNUMS(x, y);
|
||||||
POP_BIGNUMS(x,y);
|
ctx->replace(tag<bignum>(bignum_bitwise_ior(x, y)));
|
||||||
ctx->replace(tag<bignum>(bignum_bitwise_and(x,y)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_or()
|
void factor_vm::primitive_bignum_xor() {
|
||||||
{
|
POP_BIGNUMS(x, y);
|
||||||
POP_BIGNUMS(x,y);
|
ctx->replace(tag<bignum>(bignum_bitwise_xor(x, y)));
|
||||||
ctx->replace(tag<bignum>(bignum_bitwise_ior(x,y)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_xor()
|
void factor_vm::primitive_bignum_shift() {
|
||||||
{
|
fixnum y = untag_fixnum(ctx->pop());
|
||||||
POP_BIGNUMS(x,y);
|
bignum* x = untag<bignum>(ctx->peek());
|
||||||
ctx->replace(tag<bignum>(bignum_bitwise_xor(x,y)));
|
ctx->replace(tag<bignum>(bignum_arithmetic_shift(x, y)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_shift()
|
void factor_vm::primitive_bignum_less() {
|
||||||
{
|
POP_BIGNUMS(x, y);
|
||||||
fixnum y = untag_fixnum(ctx->pop());
|
ctx->replace(tag_boolean(bignum_compare(x, y) == bignum_comparison_less));
|
||||||
bignum* x = untag<bignum>(ctx->peek());
|
|
||||||
ctx->replace(tag<bignum>(bignum_arithmetic_shift(x,y)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_less()
|
void factor_vm::primitive_bignum_lesseq() {
|
||||||
{
|
POP_BIGNUMS(x, y);
|
||||||
POP_BIGNUMS(x,y);
|
ctx->replace(tag_boolean(bignum_compare(x, y) != bignum_comparison_greater));
|
||||||
ctx->replace(tag_boolean(bignum_compare(x,y) == bignum_comparison_less));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_lesseq()
|
void factor_vm::primitive_bignum_greater() {
|
||||||
{
|
POP_BIGNUMS(x, y);
|
||||||
POP_BIGNUMS(x,y);
|
ctx->replace(tag_boolean(bignum_compare(x, y) == bignum_comparison_greater));
|
||||||
ctx->replace(tag_boolean(bignum_compare(x,y) != bignum_comparison_greater));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_greater()
|
void factor_vm::primitive_bignum_greatereq() {
|
||||||
{
|
POP_BIGNUMS(x, y);
|
||||||
POP_BIGNUMS(x,y);
|
ctx->replace(tag_boolean(bignum_compare(x, y) != bignum_comparison_less));
|
||||||
ctx->replace(tag_boolean(bignum_compare(x,y) == bignum_comparison_greater));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_greatereq()
|
void factor_vm::primitive_bignum_not() {
|
||||||
{
|
ctx->replace(tag<bignum>(bignum_bitwise_not(untag<bignum>(ctx->peek()))));
|
||||||
POP_BIGNUMS(x,y);
|
|
||||||
ctx->replace(tag_boolean(bignum_compare(x,y) != bignum_comparison_less));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_not()
|
void factor_vm::primitive_bignum_bitp() {
|
||||||
{
|
int bit = (int) to_fixnum(ctx->pop());
|
||||||
ctx->replace(tag<bignum>(bignum_bitwise_not(untag<bignum>(ctx->peek()))));
|
bignum* x = untag<bignum>(ctx->peek());
|
||||||
|
ctx->replace(tag_boolean(bignum_logbitp(bit, x)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_bitp()
|
void factor_vm::primitive_bignum_log2() {
|
||||||
{
|
ctx->replace(tag<bignum>(bignum_integer_length(untag<bignum>(ctx->peek()))));
|
||||||
int bit = (int)to_fixnum(ctx->pop());
|
|
||||||
bignum *x = untag<bignum>(ctx->peek());
|
|
||||||
ctx->replace(tag_boolean(bignum_logbitp(bit,x)));
|
|
||||||
}
|
|
||||||
|
|
||||||
void factor_vm::primitive_bignum_log2()
|
|
||||||
{
|
|
||||||
ctx->replace(tag<bignum>(bignum_integer_length(untag<bignum>(ctx->peek()))));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
cell factor_vm::unbox_array_size_slow()
|
cell factor_vm::unbox_array_size_slow() {
|
||||||
{
|
if (tagged<object>(ctx->peek()).type() == BIGNUM_TYPE) {
|
||||||
if(tagged<object>(ctx->peek()).type() == BIGNUM_TYPE)
|
bignum* zero = untag<bignum>(bignum_zero);
|
||||||
{
|
GC_BIGNUM(zero);
|
||||||
bignum *zero = untag<bignum>(bignum_zero);
|
bignum* max = cell_to_bignum(array_size_max);
|
||||||
GC_BIGNUM(zero);
|
bignum* n = untag<bignum>(ctx->peek());
|
||||||
bignum *max = cell_to_bignum(array_size_max);
|
if (bignum_compare(n, zero) != bignum_comparison_less &&
|
||||||
bignum *n = untag<bignum>(ctx->peek());
|
bignum_compare(n, max) == bignum_comparison_less) {
|
||||||
if(bignum_compare(n,zero) != bignum_comparison_less
|
ctx->pop();
|
||||||
&& bignum_compare(n,max) == bignum_comparison_less)
|
return bignum_to_cell(n);
|
||||||
{
|
}
|
||||||
ctx->pop();
|
}
|
||||||
return bignum_to_cell(n);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
general_error(ERROR_ARRAY_SIZE,ctx->pop(),tag_fixnum(array_size_max));
|
general_error(ERROR_ARRAY_SIZE, ctx->pop(), tag_fixnum(array_size_max));
|
||||||
return 0; /* can't happen */
|
return 0; /* can't happen */
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
void factor_vm::primitive_fixnum_to_float()
|
void factor_vm::primitive_fixnum_to_float() {
|
||||||
{
|
ctx->replace(allot_float(fixnum_to_float(ctx->peek())));
|
||||||
ctx->replace(allot_float(fixnum_to_float(ctx->peek())));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
void factor_vm::primitive_format_float()
|
void factor_vm::primitive_format_float() {
|
||||||
{
|
byte_array* array = allot_byte_array(100);
|
||||||
byte_array *array = allot_byte_array(100);
|
char* format = alien_offset(ctx->pop());
|
||||||
char *format = alien_offset(ctx->pop());
|
double value = untag_float_check(ctx->peek());
|
||||||
double value = untag_float_check(ctx->peek());
|
SNPRINTF(array->data<char>(), 99, format, value);
|
||||||
SNPRINTF(array->data<char>(),99,format,value);
|
ctx->replace(tag<byte_array>(array));
|
||||||
ctx->replace(tag<byte_array>(array));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#define POP_FLOATS(x,y) \
|
#define POP_FLOATS(x, y) \
|
||||||
double y = untag_float(ctx->pop()); \
|
double y = untag_float(ctx->pop()); \
|
||||||
double x = untag_float(ctx->peek());
|
double x = untag_float(ctx->peek());
|
||||||
|
|
||||||
void factor_vm::primitive_float_eq()
|
void factor_vm::primitive_float_eq() {
|
||||||
{
|
POP_FLOATS(x, y);
|
||||||
POP_FLOATS(x,y);
|
ctx->replace(tag_boolean(x == y));
|
||||||
ctx->replace(tag_boolean(x == y));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
void factor_vm::primitive_float_add()
|
void factor_vm::primitive_float_add() {
|
||||||
{
|
POP_FLOATS(x, y);
|
||||||
POP_FLOATS(x,y);
|
ctx->replace(allot_float(x + y));
|
||||||
ctx->replace(allot_float(x + y));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
void factor_vm::primitive_float_subtract()
|
void factor_vm::primitive_float_subtract() {
|
||||||
{
|
POP_FLOATS(x, y);
|
||||||
POP_FLOATS(x,y);
|
ctx->replace(allot_float(x - y));
|
||||||
ctx->replace(allot_float(x - y));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
void factor_vm::primitive_float_multiply()
|
void factor_vm::primitive_float_multiply() {
|
||||||
{
|
POP_FLOATS(x, y);
|
||||||
POP_FLOATS(x,y);
|
ctx->replace(allot_float(x * y));
|
||||||
ctx->replace(allot_float(x * y));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
void factor_vm::primitive_float_divfloat()
|
void factor_vm::primitive_float_divfloat() {
|
||||||
{
|
POP_FLOATS(x, y);
|
||||||
POP_FLOATS(x,y);
|
ctx->replace(allot_float(x / y));
|
||||||
ctx->replace(allot_float(x / y));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_float_less()
|
void factor_vm::primitive_float_less() {
|
||||||
{
|
POP_FLOATS(x, y);
|
||||||
POP_FLOATS(x,y);
|
ctx->replace(tag_boolean(x < y));
|
||||||
ctx->replace(tag_boolean(x < y));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_float_lesseq()
|
void factor_vm::primitive_float_lesseq() {
|
||||||
{
|
POP_FLOATS(x, y);
|
||||||
POP_FLOATS(x,y);
|
ctx->replace(tag_boolean(x <= y));
|
||||||
ctx->replace(tag_boolean(x <= y));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_float_greater()
|
void factor_vm::primitive_float_greater() {
|
||||||
{
|
POP_FLOATS(x, y);
|
||||||
POP_FLOATS(x,y);
|
ctx->replace(tag_boolean(x > y));
|
||||||
ctx->replace(tag_boolean(x > y));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_float_greatereq()
|
void factor_vm::primitive_float_greatereq() {
|
||||||
{
|
POP_FLOATS(x, y);
|
||||||
POP_FLOATS(x,y);
|
ctx->replace(tag_boolean(x >= y));
|
||||||
ctx->replace(tag_boolean(x >= y));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
void factor_vm::primitive_float_bits()
|
void factor_vm::primitive_float_bits() {
|
||||||
{
|
ctx->push(
|
||||||
ctx->push(from_unsigned_cell(float_bits((float)untag_float_check(ctx->pop()))));
|
from_unsigned_cell(float_bits((float) untag_float_check(ctx->pop()))));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
void factor_vm::primitive_bits_float()
|
void factor_vm::primitive_bits_float() {
|
||||||
{
|
ctx->push(allot_float(bits_float((u32) to_cell(ctx->pop()))));
|
||||||
ctx->push(allot_float(bits_float((u32)to_cell(ctx->pop()))));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void factor_vm::primitive_double_bits()
|
void factor_vm::primitive_double_bits() {
|
||||||
{
|
ctx->push(from_unsigned_8(double_bits(untag_float_check(ctx->pop()))));
|
||||||
ctx->push(from_unsigned_8(double_bits(untag_float_check(ctx->pop()))));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
void factor_vm::primitive_bits_double()
|
void factor_vm::primitive_bits_double() {
|
||||||
{
|
ctx->push(allot_float(bits_double(to_unsigned_8(ctx->pop()))));
|
||||||
ctx->push(allot_float(bits_double(to_unsigned_8(ctx->pop()))));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Cannot allocate */
|
/* Cannot allocate */
|
||||||
fixnum factor_vm::to_fixnum(cell tagged)
|
fixnum factor_vm::to_fixnum(cell tagged) {
|
||||||
{
|
switch (TAG(tagged)) {
|
||||||
switch(TAG(tagged))
|
case FIXNUM_TYPE:
|
||||||
{
|
return untag_fixnum(tagged);
|
||||||
case FIXNUM_TYPE:
|
case BIGNUM_TYPE:
|
||||||
return untag_fixnum(tagged);
|
return bignum_to_fixnum(untag<bignum>(tagged));
|
||||||
case BIGNUM_TYPE:
|
default:
|
||||||
return bignum_to_fixnum(untag<bignum>(tagged));
|
type_error(FIXNUM_TYPE, tagged);
|
||||||
default:
|
return 0; /* can't happen */
|
||||||
type_error(FIXNUM_TYPE,tagged);
|
}
|
||||||
return 0; /* can't happen */
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VM_C_API fixnum to_fixnum(cell tagged, factor_vm *parent)
|
VM_C_API fixnum to_fixnum(cell tagged, factor_vm* parent) {
|
||||||
{
|
return parent->to_fixnum(tagged);
|
||||||
return parent->to_fixnum(tagged);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
cell factor_vm::to_cell(cell tagged)
|
cell factor_vm::to_cell(cell tagged) { return (cell) to_fixnum(tagged); }
|
||||||
{
|
|
||||||
return (cell)to_fixnum(tagged);
|
|
||||||
}
|
|
||||||
|
|
||||||
VM_C_API cell to_cell(cell tagged, factor_vm *parent)
|
VM_C_API cell to_cell(cell tagged, factor_vm* parent) {
|
||||||
{
|
return parent->to_cell(tagged);
|
||||||
return parent->to_cell(tagged);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
VM_C_API cell from_signed_cell(fixnum integer, factor_vm *parent)
|
VM_C_API cell from_signed_cell(fixnum integer, factor_vm* parent) {
|
||||||
{
|
return parent->from_signed_cell(integer);
|
||||||
return parent->from_signed_cell(integer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
VM_C_API cell from_unsigned_cell(cell integer, factor_vm *parent)
|
VM_C_API cell from_unsigned_cell(cell integer, factor_vm* parent) {
|
||||||
{
|
return parent->from_unsigned_cell(integer);
|
||||||
return parent->from_unsigned_cell(integer);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
cell factor_vm::from_signed_8(s64 n)
|
cell factor_vm::from_signed_8(s64 n) {
|
||||||
{
|
if (n < fixnum_min || n > fixnum_max)
|
||||||
if(n < fixnum_min || n > fixnum_max)
|
return tag<bignum>(long_long_to_bignum(n));
|
||||||
return tag<bignum>(long_long_to_bignum(n));
|
else
|
||||||
else
|
return tag_fixnum((fixnum) n);
|
||||||
return tag_fixnum((fixnum)n);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VM_C_API cell from_signed_8(s64 n, factor_vm *parent)
|
VM_C_API cell from_signed_8(s64 n, factor_vm* parent) {
|
||||||
{
|
return parent->from_signed_8(n);
|
||||||
return parent->from_signed_8(n);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Cannot allocate */
|
/* Cannot allocate */
|
||||||
s64 factor_vm::to_signed_8(cell obj)
|
s64 factor_vm::to_signed_8(cell obj) {
|
||||||
{
|
switch (tagged<object>(obj).type()) {
|
||||||
switch(tagged<object>(obj).type())
|
case FIXNUM_TYPE:
|
||||||
{
|
return untag_fixnum(obj);
|
||||||
case FIXNUM_TYPE:
|
case BIGNUM_TYPE:
|
||||||
return untag_fixnum(obj);
|
return bignum_to_long_long(untag<bignum>(obj));
|
||||||
case BIGNUM_TYPE:
|
default:
|
||||||
return bignum_to_long_long(untag<bignum>(obj));
|
type_error(BIGNUM_TYPE, obj);
|
||||||
default:
|
return 0;
|
||||||
type_error(BIGNUM_TYPE,obj);
|
}
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VM_C_API s64 to_signed_8(cell obj, factor_vm *parent)
|
VM_C_API s64 to_signed_8(cell obj, factor_vm* parent) {
|
||||||
{
|
return parent->to_signed_8(obj);
|
||||||
return parent->to_signed_8(obj);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
cell factor_vm::from_unsigned_8(u64 n)
|
cell factor_vm::from_unsigned_8(u64 n) {
|
||||||
{
|
if (n > (u64) fixnum_max)
|
||||||
if(n > (u64)fixnum_max)
|
return tag<bignum>(ulong_long_to_bignum(n));
|
||||||
return tag<bignum>(ulong_long_to_bignum(n));
|
else
|
||||||
else
|
return tag_fixnum((fixnum) n);
|
||||||
return tag_fixnum((fixnum)n);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VM_C_API cell from_unsigned_8(u64 n, factor_vm *parent)
|
VM_C_API cell from_unsigned_8(u64 n, factor_vm* parent) {
|
||||||
{
|
return parent->from_unsigned_8(n);
|
||||||
return parent->from_unsigned_8(n);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Cannot allocate */
|
/* Cannot allocate */
|
||||||
u64 factor_vm::to_unsigned_8(cell obj)
|
u64 factor_vm::to_unsigned_8(cell obj) {
|
||||||
{
|
switch (tagged<object>(obj).type()) {
|
||||||
switch(tagged<object>(obj).type())
|
case FIXNUM_TYPE:
|
||||||
{
|
return untag_fixnum(obj);
|
||||||
case FIXNUM_TYPE:
|
case BIGNUM_TYPE:
|
||||||
return untag_fixnum(obj);
|
return bignum_to_ulong_long(untag<bignum>(obj));
|
||||||
case BIGNUM_TYPE:
|
default:
|
||||||
return bignum_to_ulong_long(untag<bignum>(obj));
|
type_error(BIGNUM_TYPE, obj);
|
||||||
default:
|
return 0;
|
||||||
type_error(BIGNUM_TYPE,obj);
|
}
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VM_C_API u64 to_unsigned_8(cell obj, factor_vm *parent)
|
VM_C_API u64 to_unsigned_8(cell obj, factor_vm* parent) {
|
||||||
{
|
return parent->to_unsigned_8(obj);
|
||||||
return parent->to_unsigned_8(obj);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Cannot allocate */
|
|
||||||
float factor_vm::to_float(cell value)
|
|
||||||
{
|
|
||||||
return (float)untag_float_check(value);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Cannot allocate */
|
/* Cannot allocate */
|
||||||
double factor_vm::to_double(cell value)
|
float factor_vm::to_float(cell value) {
|
||||||
{
|
return (float) untag_float_check(value);
|
||||||
return untag_float_check(value);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Cannot allocate */
|
||||||
|
double factor_vm::to_double(cell value) { return untag_float_check(value); }
|
||||||
|
|
||||||
/* The fixnum+, fixnum- and fixnum* primitives are defined in cpu_*.S. On
|
/* The fixnum+, fixnum- and fixnum* primitives are defined in cpu_*.S. On
|
||||||
overflow, they call these functions. */
|
overflow, they call these functions. */
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
inline void factor_vm::overflow_fixnum_add(fixnum x, fixnum y)
|
inline void factor_vm::overflow_fixnum_add(fixnum x, fixnum y) {
|
||||||
{
|
ctx->replace(
|
||||||
ctx->replace(tag<bignum>(fixnum_to_bignum(
|
tag<bignum>(fixnum_to_bignum(untag_fixnum(x) + untag_fixnum(y))));
|
||||||
untag_fixnum(x) + untag_fixnum(y))));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VM_C_API void overflow_fixnum_add(fixnum x, fixnum y, factor_vm *parent)
|
VM_C_API void overflow_fixnum_add(fixnum x, fixnum y, factor_vm* parent) {
|
||||||
{
|
parent->overflow_fixnum_add(x, y);
|
||||||
parent->overflow_fixnum_add(x,y);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
inline void factor_vm::overflow_fixnum_subtract(fixnum x, fixnum y)
|
inline void factor_vm::overflow_fixnum_subtract(fixnum x, fixnum y) {
|
||||||
{
|
ctx->replace(
|
||||||
ctx->replace(tag<bignum>(fixnum_to_bignum(
|
tag<bignum>(fixnum_to_bignum(untag_fixnum(x) - untag_fixnum(y))));
|
||||||
untag_fixnum(x) - untag_fixnum(y))));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VM_C_API void overflow_fixnum_subtract(fixnum x, fixnum y, factor_vm *parent)
|
VM_C_API void overflow_fixnum_subtract(fixnum x, fixnum y, factor_vm* parent) {
|
||||||
{
|
parent->overflow_fixnum_subtract(x, y);
|
||||||
parent->overflow_fixnum_subtract(x,y);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
inline void factor_vm::overflow_fixnum_multiply(fixnum x, fixnum y)
|
inline void factor_vm::overflow_fixnum_multiply(fixnum x, fixnum y) {
|
||||||
{
|
bignum* bx = fixnum_to_bignum(x);
|
||||||
bignum *bx = fixnum_to_bignum(x);
|
GC_BIGNUM(bx);
|
||||||
GC_BIGNUM(bx);
|
bignum* by = fixnum_to_bignum(y);
|
||||||
bignum *by = fixnum_to_bignum(y);
|
GC_BIGNUM(by);
|
||||||
GC_BIGNUM(by);
|
ctx->replace(tag<bignum>(bignum_multiply(bx, by)));
|
||||||
ctx->replace(tag<bignum>(bignum_multiply(bx,by)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VM_C_API void overflow_fixnum_multiply(fixnum x, fixnum y, factor_vm *parent)
|
VM_C_API void overflow_fixnum_multiply(fixnum x, fixnum y, factor_vm* parent) {
|
||||||
{
|
parent->overflow_fixnum_multiply(x, y);
|
||||||
parent->overflow_fixnum_multiply(x,y);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
111
vm/math.hpp
111
vm/math.hpp
|
|
@ -1,91 +1,80 @@
|
||||||
namespace factor
|
namespace factor {
|
||||||
{
|
|
||||||
|
|
||||||
static const fixnum fixnum_max = (((fixnum)1 << (WORD_SIZE - TAG_BITS - 1)) - 1);
|
static const fixnum fixnum_max =
|
||||||
static const fixnum fixnum_min = (-((fixnum)1 << (WORD_SIZE - TAG_BITS - 1)));
|
(((fixnum) 1 << (WORD_SIZE - TAG_BITS - 1)) - 1);
|
||||||
static const fixnum array_size_max = ((cell)1 << (WORD_SIZE - TAG_BITS - 2));
|
static const fixnum fixnum_min = (-((fixnum) 1 << (WORD_SIZE - TAG_BITS - 1)));
|
||||||
|
static const fixnum array_size_max = ((cell) 1 << (WORD_SIZE - TAG_BITS - 2));
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
inline cell factor_vm::from_signed_cell(fixnum x)
|
inline cell factor_vm::from_signed_cell(fixnum x) {
|
||||||
{
|
if (x < fixnum_min || x > fixnum_max)
|
||||||
if(x < fixnum_min || x > fixnum_max)
|
return tag<bignum>(fixnum_to_bignum(x));
|
||||||
return tag<bignum>(fixnum_to_bignum(x));
|
else
|
||||||
else
|
return tag_fixnum(x);
|
||||||
return tag_fixnum(x);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
inline cell factor_vm::from_unsigned_cell(cell x)
|
inline cell factor_vm::from_unsigned_cell(cell x) {
|
||||||
{
|
if (x > (cell) fixnum_max)
|
||||||
if(x > (cell)fixnum_max)
|
return tag<bignum>(cell_to_bignum(x));
|
||||||
return tag<bignum>(cell_to_bignum(x));
|
else
|
||||||
else
|
return tag_fixnum(x);
|
||||||
return tag_fixnum(x);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
inline cell factor_vm::allot_float(double n)
|
inline cell factor_vm::allot_float(double n) {
|
||||||
{
|
boxed_float* flo = allot<boxed_float>(sizeof(boxed_float));
|
||||||
boxed_float *flo = allot<boxed_float>(sizeof(boxed_float));
|
flo->n = n;
|
||||||
flo->n = n;
|
return tag(flo);
|
||||||
return tag(flo);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Allocates memory */
|
/* Allocates memory */
|
||||||
inline bignum *factor_vm::float_to_bignum(cell tagged)
|
inline bignum* factor_vm::float_to_bignum(cell tagged) {
|
||||||
{
|
return double_to_bignum(untag_float(tagged));
|
||||||
return double_to_bignum(untag_float(tagged));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
inline double factor_vm::untag_float(cell tagged)
|
inline double factor_vm::untag_float(cell tagged) {
|
||||||
{
|
return untag<boxed_float>(tagged)->n;
|
||||||
return untag<boxed_float>(tagged)->n;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
inline double factor_vm::untag_float_check(cell tagged)
|
inline double factor_vm::untag_float_check(cell tagged) {
|
||||||
{
|
return untag_check<boxed_float>(tagged)->n;
|
||||||
return untag_check<boxed_float>(tagged)->n;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
inline fixnum factor_vm::float_to_fixnum(cell tagged)
|
inline fixnum factor_vm::float_to_fixnum(cell tagged) {
|
||||||
{
|
return (fixnum) untag_float(tagged);
|
||||||
return (fixnum)untag_float(tagged);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
inline double factor_vm::fixnum_to_float(cell tagged)
|
inline double factor_vm::fixnum_to_float(cell tagged) {
|
||||||
{
|
return (double) untag_fixnum(tagged);
|
||||||
return (double)untag_fixnum(tagged);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
inline cell factor_vm::unbox_array_size()
|
inline cell factor_vm::unbox_array_size() {
|
||||||
{
|
cell obj = ctx->peek();
|
||||||
cell obj = ctx->peek();
|
if (TAG(obj) == FIXNUM_TYPE) {
|
||||||
if(TAG(obj) == FIXNUM_TYPE)
|
fixnum n = untag_fixnum(obj);
|
||||||
{
|
if (n >= 0 && n < (fixnum) array_size_max) {
|
||||||
fixnum n = untag_fixnum(obj);
|
ctx->pop();
|
||||||
if(n >= 0 && n < (fixnum)array_size_max)
|
return n;
|
||||||
{
|
}
|
||||||
ctx->pop();
|
}
|
||||||
return n;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return unbox_array_size_slow();
|
return unbox_array_size_slow();
|
||||||
}
|
}
|
||||||
|
|
||||||
VM_C_API cell from_signed_cell(fixnum integer, factor_vm *vm);
|
VM_C_API cell from_signed_cell(fixnum integer, factor_vm* vm);
|
||||||
VM_C_API cell from_unsigned_cell(cell integer, factor_vm *vm);
|
VM_C_API cell from_unsigned_cell(cell integer, factor_vm* vm);
|
||||||
VM_C_API cell from_signed_8(s64 n, factor_vm *vm);
|
VM_C_API cell from_signed_8(s64 n, factor_vm* vm);
|
||||||
VM_C_API cell from_unsigned_8(u64 n, factor_vm *vm);
|
VM_C_API cell from_unsigned_8(u64 n, factor_vm* vm);
|
||||||
|
|
||||||
VM_C_API s64 to_signed_8(cell obj, factor_vm *parent);
|
VM_C_API s64 to_signed_8(cell obj, factor_vm* parent);
|
||||||
VM_C_API u64 to_unsigned_8(cell obj, factor_vm *parent);
|
VM_C_API u64 to_unsigned_8(cell obj, factor_vm* parent);
|
||||||
|
|
||||||
VM_C_API fixnum to_fixnum(cell tagged, factor_vm *vm);
|
VM_C_API fixnum to_fixnum(cell tagged, factor_vm* vm);
|
||||||
VM_C_API cell to_cell(cell tagged, factor_vm *vm);
|
VM_C_API cell to_cell(cell tagged, factor_vm* vm);
|
||||||
|
|
||||||
VM_C_API void overflow_fixnum_add(fixnum x, fixnum y, factor_vm *parent);
|
VM_C_API void overflow_fixnum_add(fixnum x, fixnum y, factor_vm* parent);
|
||||||
VM_C_API void overflow_fixnum_subtract(fixnum x, fixnum y, factor_vm *parent);
|
VM_C_API void overflow_fixnum_subtract(fixnum x, fixnum y, factor_vm* parent);
|
||||||
VM_C_API void overflow_fixnum_multiply(fixnum x, fixnum y, factor_vm *parent);
|
VM_C_API void overflow_fixnum_multiply(fixnum x, fixnum y, factor_vm* parent);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue