audio.engine.test: cleanup using

[factor.git] / vm / math.hpp

diff --git a/vm/math.hpp b/vm/math.hpp
index 5e6121afb236fd74e7a762e5b99aa0e4e16359e3..c0b6f7ed326049cd5a0cc570b291cc09f7980cf1 100644 (file)
--- a/vm/math.hpp
+++ b/vm/math.hpp
@@ -1,90 +1,75 @@
-namespace factor
-{
+namespace factor {
 
-static const fixnum fixnum_max = (((fixnum)1 << (WORD_SIZE - TAG_BITS - 1)) - 1);
+static const fixnum fixnum_max =
+    (((fixnum)1 << (WORD_SIZE - TAG_BITS - 1)) - 1);
 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));
 
-// defined in assembler
-PRIMITIVE(fixnum_add);
-PRIMITIVE(fixnum_subtract);
-PRIMITIVE(fixnum_multiply);
+// Allocates memory
+inline cell factor_vm::from_signed_cell(fixnum x) {
+  if (x < fixnum_min || x > fixnum_max)
+    return tag<bignum>(fixnum_to_bignum(x));
+  return tag_fixnum(x);
+}
 
-PRIMITIVE(bignum_to_fixnum);
-PRIMITIVE(float_to_fixnum);
+// Allocates memory
+inline cell factor_vm::from_unsigned_cell(cell x) {
+  if (x > (cell)fixnum_max)
+    return tag<bignum>(cell_to_bignum(x));
+  return tag_fixnum(x);
+}
 
-PRIMITIVE(fixnum_divint);
-PRIMITIVE(fixnum_divmod);
-PRIMITIVE(fixnum_shift);
+// Allocates memory
+inline cell factor_vm::allot_float(double n) {
+  boxed_float* flo = allot<boxed_float>(sizeof(boxed_float));
+  flo->n = n;
+  return tag(flo);
+}
+
+// Allocates memory
+inline bignum* factor_vm::float_to_bignum(cell tagged) {
+  return double_to_bignum(untag_float(tagged));
+}
 
-PRIMITIVE(fixnum_to_bignum);
-PRIMITIVE(float_to_bignum);
-PRIMITIVE(bignum_eq);
-PRIMITIVE(bignum_add);
-PRIMITIVE(bignum_subtract);
-PRIMITIVE(bignum_multiply);
-PRIMITIVE(bignum_divint);
-PRIMITIVE(bignum_divmod);
-PRIMITIVE(bignum_mod);
-PRIMITIVE(bignum_and);
-PRIMITIVE(bignum_or);
-PRIMITIVE(bignum_xor);
-PRIMITIVE(bignum_shift);
-PRIMITIVE(bignum_less);
-PRIMITIVE(bignum_lesseq);
-PRIMITIVE(bignum_greater);
-PRIMITIVE(bignum_greatereq);
-PRIMITIVE(bignum_not);
-PRIMITIVE(bignum_bitp);
-PRIMITIVE(bignum_log2);
-PRIMITIVE(byte_array_to_bignum);
+inline double factor_vm::untag_float(cell tagged) {
+  return untag<boxed_float>(tagged)->n;
+}
 
-PRIMITIVE(fixnum_to_float);
-PRIMITIVE(bignum_to_float);
-PRIMITIVE(str_to_float);
-PRIMITIVE(float_to_str);
-PRIMITIVE(float_to_bits);
+inline double factor_vm::untag_float_check(cell tagged) {
+  return untag_check<boxed_float>(tagged)->n;
+}
 
-PRIMITIVE(float_eq);
-PRIMITIVE(float_add);
-PRIMITIVE(float_subtract);
-PRIMITIVE(float_multiply);
-PRIMITIVE(float_divfloat);
-PRIMITIVE(float_mod);
-PRIMITIVE(float_less);
-PRIMITIVE(float_lesseq);
-PRIMITIVE(float_greater);
-PRIMITIVE(float_greatereq);
+inline fixnum factor_vm::float_to_fixnum(cell tagged) {
+  return (fixnum)untag_float(tagged);
+}
 
-PRIMITIVE(float_bits);
-PRIMITIVE(bits_float);
-PRIMITIVE(double_bits);
-PRIMITIVE(bits_double);
+inline double factor_vm::fixnum_to_float(cell tagged) {
+  return (double)untag_fixnum(tagged);
+}
 
-VM_C_API void box_float(float flo, factorvm *vm);
-VM_C_API float to_float(cell value, factorvm *vm);
-VM_C_API void box_double(double flo, factorvm *vm);
-VM_C_API double to_double(cell value, factorvm *vm);
+inline cell factor_vm::unbox_array_size() {
+  cell obj = ctx->pop();
+  fixnum n = to_fixnum_strict(obj);
+  if (n >= 0 && n < (fixnum)array_size_max) {
+    return n;
+  }
+  general_error(ERROR_ARRAY_SIZE, obj, tag_fixnum(array_size_max));
+  return 0; // can't happen
+}
 
-VM_C_API void box_signed_1(s8 n, factorvm *vm);
-VM_C_API void box_unsigned_1(u8 n, factorvm *vm);
-VM_C_API void box_signed_2(s16 n, factorvm *vm);
-VM_C_API void box_unsigned_2(u16 n, factorvm *vm);
-VM_C_API void box_signed_4(s32 n, factorvm *vm);
-VM_C_API void box_unsigned_4(u32 n, factorvm *vm);
-VM_C_API void box_signed_cell(fixnum integer, factorvm *vm);
-VM_C_API void box_unsigned_cell(cell cell, factorvm *vm);
-VM_C_API void box_signed_8(s64 n, factorvm *vm);
-VM_C_API void box_unsigned_8(u64 n, factorvm *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_signed_8(int64_t n, factor_vm* vm);
+VM_C_API cell from_unsigned_8(uint64_t n, factor_vm* vm);
 
-VM_C_API s64 to_signed_8(cell obj, factorvm *vm);
-VM_C_API u64 to_unsigned_8(cell obj, factorvm *vm);
+VM_C_API int64_t to_signed_8(cell obj, factor_vm* parent);
+VM_C_API uint64_t to_unsigned_8(cell obj, factor_vm* parent);
 
-VM_C_API fixnum to_fixnum(cell tagged, factorvm *vm);
-VM_C_API cell to_cell(cell tagged, factorvm *vm);
+VM_C_API fixnum to_fixnum(cell tagged, factor_vm* vm);
+VM_C_API cell to_cell(cell tagged, factor_vm* vm);
 
-VM_ASM_API_OVERFLOW void overflow_fixnum_add(fixnum x, fixnum y, factorvm *vm);
-VM_ASM_API_OVERFLOW void overflow_fixnum_subtract(fixnum x, fixnum y, factorvm *vm);
-VM_ASM_API_OVERFLOW void overflow_fixnum_multiply(fixnum x, fixnum y, factorvm *vm);
+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_multiply(fixnum x, fixnum y, factor_vm* parent);
 
 }