Altered API getting the allocation from a vm_alloc_t. Added preliminary internal file descriptor type. Test groups now print out their name.

arr committed 10 years ago

Commit 5a417ba1 parent 9881f459 files · +230 −104Browse files

Showing the changes to src/vm/thread.cpp (1 of 9 files). Show all

Unified · Split

@@ -28,7 +28,7 @@ namespace · 27 unmodified lines
28	28	reg.src = reinterpret_cast<pointer_t>(reinterpret_cast<uint8_t *>(reg.stack.peek_frame()->base()) + inst.source.register1);
29	29	break;
30	30	case address_mode_t::offset_indirect_mp:
31		− reg.src = reinterpret_cast<pointer_t>(reinterpret_cast<uint8_t *>(reg.mp_base->allocation()) + inst.source.register1);
	31	+ reg.src = reinterpret_cast<pointer_t>(reinterpret_cast<uint8_t *>(reg.mp_base->get_allocation()) + inst.source.register1);
32	32	break;
33	33	case address_mode_t::offset_double_indirect_fp:
34	34	{
@@ -38,7 +38,7 @@ namespace · 3 unmodified lines
38	38	}
39	39	case address_mode_t::offset_double_indirect_mp:
40	40	{
41		− const auto mp_offset = reinterpret_cast<std::size_t >(reinterpret_cast<uint8_t *>(reg.mp_base->allocation()) + inst.source.register1);
	41	+ const auto mp_offset = reinterpret_cast<std::size_t >(reinterpret_cast<uint8_t *>(reg.mp_base->get_allocation()) + inst.source.register1);
42	42	reg.src = reinterpret_cast<pointer_t>(mp_offset + inst.source.register2);
43	43	break;
44	44	}
@@ -58,7 +58,7 @@ namespace · 13 unmodified lines
58	58	reg.dest = reinterpret_cast<pointer_t>(reinterpret_cast<uint8_t *>(reg.stack.peek_frame()->base()) + inst.destination.register1);
59	59	break;
60	60	case address_mode_t::offset_indirect_mp:
61		− reg.dest = reinterpret_cast<pointer_t>(reinterpret_cast<uint8_t *>(reg.mp_base->allocation()) + inst.destination.register1);
	61	+ reg.dest = reinterpret_cast<pointer_t>(reinterpret_cast<uint8_t *>(reg.mp_base->get_allocation()) + inst.destination.register1);
62	62	break;
63	63	case address_mode_t::offset_double_indirect_fp:
64	64	{
@@ -68,7 +68,7 @@ namespace · 3 unmodified lines
68	68	}
69	69	case address_mode_t::offset_double_indirect_mp:
70	70	{
71		− const auto mp_offset = reinterpret_cast<std::size_t >(reinterpret_cast<uint8_t *>(reg.mp_base->allocation()) + inst.destination.register1);
	71	+ const auto mp_offset = reinterpret_cast<std::size_t >(reinterpret_cast<uint8_t *>(reg.mp_base->get_allocation()) + inst.destination.register1);
72	72	reg.dest = reinterpret_cast<pointer_t>(mp_offset + inst.destination.register2);
73	73	break;
74	74	}
@@ -88,7 +88,7 @@ namespace · 13 unmodified lines
88	88	reg.mid = reinterpret_cast<pointer_t>(reinterpret_cast<uint8_t *>(reg.stack.peek_frame()->base()) + inst.middle.register1);
89	89	break;
90	90	case address_mode_middle_t::small_offset_indirect_mp:
91		− reg.mid = reinterpret_cast<pointer_t>(reinterpret_cast<uint8_t *>(reg.mp_base->allocation()) + inst.middle.register1);
	91	+ reg.mid = reinterpret_cast<pointer_t>(reinterpret_cast<uint8_t *>(reg.mp_base->get_allocation()) + inst.middle.register1);
92	92	break;
93	93	case address_mode_middle_t::small_immediate:
94	94	reg.mid = reinterpret_cast<pointer_t>(const_cast<word_t *>(&inst.middle.register1));