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

vm: Fix four compile warnings reported by gcc with -pedantic flag.

locals-and-roots
Doug Coleman 2016-03-30 15:29:09 -07:00
parent 6a127dc46c
commit b324c30cc7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vm/data_heap_checker.cpp
View File

@ -32,7 +32,7 @@ struct slot_checker {
slot_checker(factor_vm* parent, object* obj, generation gen)
: parent(parent), obj(obj), gen(gen) {}
void check_write_barrier(cell* slot_ptr, generation target, char mask) {
void check_write_barrier(cell* slot_ptr, generation target, cell mask) {
cell object_card_pointer = parent->cards_offset + ((cell)obj >> card_bits);
cell slot_card_pointer =
parent->cards_offset + ((cell)slot_ptr >> card_bits);

4
vm/vm.hpp
View File

@ -335,8 +335,8 @@ struct factor_vm {
/* the write barrier must be called any time we are potentially storing a
pointer from an older generation to a younger one */
inline void write_barrier(cell* slot_ptr) {
*(char*)(cards_offset + ((cell)slot_ptr >> card_bits)) = card_mark_mask;
*(char*)(decks_offset + ((cell)slot_ptr >> deck_bits)) = card_mark_mask;
*(unsigned char*)(cards_offset + ((cell)slot_ptr >> card_bits)) = card_mark_mask;
*(unsigned char*)(decks_offset + ((cell)slot_ptr >> deck_bits)) = card_mark_mask;
}
inline void write_barrier(object* obj, cell size) {