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

VM: fixes to use the TAG macro over tagged<object>(obj).type()

db4
Björn Lindqvist 2015-11-23 02:27:22 +01:00
parent a8aaa42882
commit 22bb0cfecf
6 changed files with 41 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vm/alien.cpp
View File

@ -5,7 +5,7 @@ namespace factor {
/* gets the address of an object representing a C pointer, with the
intention of storing the pointer across code which may potentially GC. */
char* factor_vm::pinned_alien_offset(cell obj) {
switch (tagged<object>(obj).type()) {
switch (TAG(obj)) {
case ALIEN_TYPE: {
alien* ptr = untag<alien>(obj);
if (to_boolean(ptr->expired))
@ -57,7 +57,7 @@ void factor_vm::primitive_displaced_alien() {
cell alien = ctx->pop();
cell displacement = to_cell(ctx->pop());
switch (tagged<object>(alien).type()) {
switch (TAG(alien)) {
case BYTE_ARRAY_TYPE:
case ALIEN_TYPE:
case F_TYPE:
@ -163,7 +163,7 @@ void factor_vm::primitive_dll_validp() {
/* gets the address of an object representing a C pointer */
char* factor_vm::alien_offset(cell obj) {
switch (tagged<object>(obj).type()) {
switch (TAG(obj)) {
case BYTE_ARRAY_TYPE:
return untag<byte_array>(obj)->data<char>();
case ALIEN_TYPE:

43
vm/code_blocks.cpp
View File

@ -3,10 +3,9 @@
namespace factor {
cell code_block::owner_quot() const {
tagged<object> executing(owner);
if (!optimized_p() && executing->type() == WORD_TYPE)
executing = executing.as<word>()->def;
return executing.value();
if (!optimized_p() && TAG(owner) == WORD_TYPE)
return untag<word>(owner)->def;
return owner;
}
/* If the code block is an unoptimized quotation, we can calculate the
@ -16,18 +15,17 @@ cell code_block::scan(factor_vm* vm, cell addr) const {
return tag_fixnum(-1);
}
tagged<object> obj(owner);
if (obj.type_p(WORD_TYPE))
obj = obj.as<word>()->def;
if (!obj.type_p(QUOTATION_TYPE))
cell ptr = owner;
if (TAG(ptr) == WORD_TYPE)
ptr = untag<word>(ptr)->def;
if (TAG(ptr) != QUOTATION_TYPE)
return tag_fixnum(-1);
cell ofs = offset(addr);
return tag_fixnum(vm->quot_code_offset_to_scan(obj.value(), ofs));
return tag_fixnum(vm->quot_code_offset_to_scan(ptr, ofs));
}
cell factor_vm::compute_entry_point_address(cell obj) {
switch (tagged<object>(obj).type()) {
switch (TAG(obj)) {
case WORD_TYPE:
return untag<word>(obj)->entry_point;
case QUOTATION_TYPE:
@ -58,24 +56,21 @@ cell factor_vm::compute_entry_point_pic_tail_address(cell w_) {
}
cell factor_vm::code_block_owner(code_block* compiled) {
tagged<object> owner(compiled->owner);
cell owner = compiled->owner;
/* Cold generic word call sites point to quotations that call the
inline-cache-miss and inline-cache-miss-tail primitives. */
if (owner.type_p(QUOTATION_TYPE)) {
tagged<quotation> quot(owner.as<quotation>());
tagged<array> elements(quot->array);
if (TAG(owner) != QUOTATION_TYPE)
return owner;
FACTOR_ASSERT(array_capacity(elements.untagged()) == 5);
FACTOR_ASSERT(array_nth(elements.untagged(), 4) ==
special_objects[PIC_MISS_WORD] ||
array_nth(elements.untagged(), 4) ==
special_objects[PIC_MISS_TAIL_WORD]);
quotation* quot = untag<quotation>(owner);
array* elements = untag<array>(quot->array);
tagged<wrapper> word_wrapper(array_nth(elements.untagged(), 0));
return word_wrapper->object;
} else
return compiled->owner;
FACTOR_ASSERT(array_capacity(elements) == 5);
FACTOR_ASSERT(array_nth(elements, 4) == special_objects[PIC_MISS_WORD] ||
array_nth(elements, 4) == special_objects[PIC_MISS_TAIL_WORD]);
wrapper* wrap = untag<wrapper>(array_nth(elements, 0));
return wrap->object;
}
struct update_word_references_relocation_visitor {

5
vm/code_blocks.hpp
View File

@ -76,7 +76,9 @@ struct code_block {
void flush_icache() { factor::flush_icache((cell)this, size()); }
template <typename Iterator> void each_instruction_operand(Iterator& iter) {
if (to_boolean(relocation)) {
if (!to_boolean(relocation))
return;
byte_array* rels = (byte_array*)UNTAG(relocation);
cell index = 0;
@ -88,7 +90,6 @@ struct code_block {
index += rel.number_of_parameters();
}
}
}
cell offset(cell addr) const { return addr - entry_point(); }

8
vm/debug.cpp
View File

@ -13,10 +13,10 @@ ostream& operator<<(ostream& out, const string* str) {
}
void factor_vm::print_word(ostream& out, word* word, cell nesting) {
if (tagged<object>(word->vocabulary).type_p(STRING_TYPE))
if (TAG(word->vocabulary) == STRING_TYPE)
out << untag<string>(word->vocabulary) << ":";
if (tagged<object>(word->name).type_p(STRING_TYPE))
if (TAG(word->name) == STRING_TYPE)
out << untag<string>(word->name);
else {
out << "#<not a string: ";
@ -112,7 +112,7 @@ void factor_vm::print_nested_obj(ostream& out, cell obj, fixnum nesting) {
quotation* quot;
switch (tagged<object>(obj).type()) {
switch (TAG(obj)) {
case FIXNUM_TYPE:
out << untag_fixnum(obj);
break;
@ -158,7 +158,7 @@ void factor_vm::print_nested_obj(ostream& out, cell obj, fixnum nesting) {
print_alien(out, untag<alien>(obj), nesting - 1);
break;
default:
out << "#<" << type_name(tagged<object>(obj).type()) << " @ ";
out << "#<" << type_name(TAG(obj)) << " @ ";
out << (void*)obj << ">";
break;
}

2
vm/dispatch.cpp
View File

@ -45,7 +45,7 @@ cell factor_vm::lookup_tuple_method(cell obj, cell methods) {
while (echelon >= 0) {
cell echelon_methods = array_nth(echelons, echelon);
if (tagged<object>(echelon_methods).type_p(WORD_TYPE))
if (TAG(echelon_methods) == WORD_TYPE)
return echelon_methods;
else if (to_boolean(echelon_methods)) {
cell klass = nth_superclass(layout, echelon);

9
vm/objects.cpp
View File

@ -102,11 +102,10 @@ void factor_vm::primitive_become() {
std::map<object*, object*> become_map;
for (cell i = 0; i < capacity; i++) {
tagged<object> old_obj(array_nth(old_objects, i));
tagged<object> new_obj(array_nth(new_objects, i));
if (old_obj != new_obj)
become_map[old_obj.untagged()] = new_obj.untagged();
cell old_ptr = array_nth(old_objects, i);
cell new_ptr = array_nth(new_objects, i);
if (old_ptr != new_ptr)
become_map[untag<object>(old_ptr)] = untag<object>(new_ptr);
}
/* Update all references to old objects to point to new objects */