audio.engine.test: cleanup using

[factor.git] / vm / math.hpp

diff --git a/vm/math.hpp b/vm/math.hpp
index 13934048cdce68968b8666785147ac30dc597152..c0b6f7ed326049cd5a0cc570b291cc09f7980cf1 100644 (file)
--- a/vm/math.hpp
+++ b/vm/math.hpp
@@ -1,103 +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));
 
-inline cell factor_vm::allot_integer(fixnum x)
-{
-       if(x < fixnum_min || x > fixnum_max)
-               return tag<bignum>(fixnum_to_bignum(x));
-       else
-               return tag_fixnum(x);
+// 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);
 }
 
-inline cell factor_vm::allot_cell(cell x)
-{
-       if(x > (cell)fixnum_max)
-               return tag<bignum>(cell_to_bignum(x));
-       else
-               return tag_fixnum(x);
+// 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);
 }
 
-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 cell factor_vm::allot_float(double n) {
+  boxed_float* flo = allot<boxed_float>(sizeof(boxed_float));
+  flo->n = n;
+  return tag(flo);
 }
 
-inline bignum *factor_vm::float_to_bignum(cell tagged)
-{
-       return double_to_bignum(untag_float(tagged));
+// Allocates memory
+inline bignum* factor_vm::float_to_bignum(cell tagged) {
+  return double_to_bignum(untag_float(tagged));
 }
 
-inline double factor_vm::bignum_to_float(cell tagged)
-{
-       return bignum_to_double(untag<bignum>(tagged));
+inline double factor_vm::untag_float(cell tagged) {
+  return untag<boxed_float>(tagged)->n;
 }
 
-inline double factor_vm::untag_float(cell tagged)
-{
-       return untag<boxed_float>(tagged)->n;
+inline double factor_vm::untag_float_check(cell tagged) {
+  return untag_check<boxed_float>(tagged)->n;
 }
 
-inline double factor_vm::untag_float_check(cell tagged)
-{
-       return untag_check<boxed_float>(tagged)->n;
+inline fixnum factor_vm::float_to_fixnum(cell tagged) {
+  return (fixnum)untag_float(tagged);
 }
 
-inline fixnum factor_vm::float_to_fixnum(cell tagged)
-{
-       return (fixnum)untag_float(tagged);
+inline double factor_vm::fixnum_to_float(cell tagged) {
+  return (double)untag_fixnum(tagged);
 }
 
-inline double factor_vm::fixnum_to_float(cell tagged)
-{
-       return (double)untag_fixnum(tagged);
+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
 }
 
-inline cell factor_vm::unbox_array_size()
-{
-       cell obj = ctx->peek();
-       if(TAG(obj) == FIXNUM_TYPE)
-       {
-               fixnum n = untag_fixnum(obj);
-               if(n >= 0 && n < (fixnum)array_size_max)
-               {
-                       ctx->pop();
-                       return n;
-               }
-       }
+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);
 
-       return unbox_array_size_slow();
-}
-
-VM_C_API cell from_float(float flo, factor_vm *vm);
-VM_C_API float to_float(cell value, factor_vm *vm);
-VM_C_API cell from_double(double flo, factor_vm *vm);
-VM_C_API double to_double(cell value, factor_vm *vm);
-
-VM_C_API cell from_signed_1(s8 n, factor_vm *vm);
-VM_C_API cell from_unsigned_1(u8 n, factor_vm *vm);
-VM_C_API cell from_signed_2(s16 n, factor_vm *vm);
-VM_C_API cell from_unsigned_2(u16 n, factor_vm *vm);
-VM_C_API cell from_signed_4(s32 n, factor_vm *vm);
-VM_C_API cell from_unsigned_4(u32 n, 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_signed_8(s64 n, factor_vm *vm);
-VM_C_API cell from_unsigned_8(u64 n, factor_vm *vm);
-
-VM_C_API void to_signed_8(cell obj, s64 *out, factor_vm *parent);
-VM_C_API void to_unsigned_8(cell obj, u64 *out, factor_vm *parent);
+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, factor_vm *vm);
-VM_C_API cell to_cell(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 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);
+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);
 
 }