steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VM: fixing some implicit casts from cell to fixnum 

The types are compatible, but it looks a little nicer if the variable
that receives a return value declared as cell also is a cell.
db4
Björn Lindqvist 2014-07-08 07:34:36 +02:00 committed by John Benediktsson
parent 6ab848775e
commit 60b7631e76
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vm/debug.cpp
View File

@ -79,7 +79,7 @@ void factor_vm::print_byte_array(byte_array* array, cell nesting) {
void factor_vm::print_tuple(tuple* tuple, cell nesting) { void factor_vm::print_tuple(tuple* tuple, cell nesting) {
tuple_layout* layout = untag<tuple_layout>(tuple->layout); tuple_layout* layout = untag<tuple_layout>(tuple->layout);
cell length = to_fixnum(layout->size); cell length = to_cell(layout->size);
std::cout << " "; std::cout << " ";
print_nested_obj(layout->klass, nesting); print_nested_obj(layout->klass, nesting);

2
vm/io.cpp
View File

@ -180,7 +180,7 @@ void factor_vm::primitive_fgetc() {
void factor_vm::primitive_fread() { void factor_vm::primitive_fread() {
FILE* file = pop_file_handle(); FILE* file = pop_file_handle();
void* buf = (void*)alien_offset(ctx->pop()); void* buf = (void*)alien_offset(ctx->pop());
fixnum size = unbox_array_size(); cell size = unbox_array_size();
if (size == 0) { if (size == 0) {
ctx->push(from_unsigned_cell(0)); ctx->push(from_unsigned_cell(0));

8
vm/quotations.cpp
View File

@ -104,9 +104,9 @@ bool quotation_jit::word_safepoint_p(cell obj) {
} }
bool quotation_jit::safepoint_p() { bool quotation_jit::safepoint_p() {
fixnum length = array_capacity(elements.untagged()); cell length = array_capacity(elements.untagged());
for (fixnum i = 0; i < length; i++) { for (cell i = 0; i < length; i++) {
cell obj = array_nth(elements.untagged(), i); cell obj = array_nth(elements.untagged(), i);
switch (tagged<object>(obj).type()) { switch (tagged<object>(obj).type()) {
case WORD_TYPE: case WORD_TYPE:
@ -122,9 +122,9 @@ bool quotation_jit::safepoint_p() {
} }
bool quotation_jit::stack_frame_p() { bool quotation_jit::stack_frame_p() {
fixnum length = array_capacity(elements.untagged()); cell length = array_capacity(elements.untagged());
for (fixnum i = 0; i < length; i++) { for (cell i = 0; i < length; i++) {
cell obj = array_nth(elements.untagged(), i); cell obj = array_nth(elements.untagged(), i);
if (tagged<object>(obj).type() == WORD_TYPE && !word_safepoint_p(obj)) if (tagged<object>(obj).type() == WORD_TYPE && !word_safepoint_p(obj))
return false; return false;