History

Remove 'using namespace' statements from all but the execution table file.

arr committed 9 years ago

Commit 2519a931 parent 68d4d6931 files · +725 −426Browse files

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

Unified · Split

src/vm/stack.cpp+27−19
@@ -11,8 +11,16 @@ · 10 unmodified lines
1111 #include <debug.h>
1212 #include <exceptions.h>
1313
14−using namespace disvm;
15−using namespace disvm::runtime;
14+using disvm::debug::component_trace_t;
15+using disvm::debug::log_level_t;
16+
17+using disvm::runtime::type_descriptor_t;
18+using disvm::runtime::pointer_t;
19+using disvm::runtime::vm_pc_t;
20+using disvm::runtime::vm_module_ref_t;
21+using disvm::runtime::vm_frame_t;
22+using disvm::runtime::vm_stack_t;
23+using disvm::runtime::vm_alloc_t;
1624
1725 namespace
1826 {
@@ -54,7 +62,7 @@ namespace · 35 unmodified lines
5462 ~vm_stack_layout()
5563 {
5664 assert(top_page != nullptr);
57− free_memory(top_page);
65+ disvm::runtime::free_memory(top_page);
5866 }
5967
6068 const std::size_t stack_page_size;
@@ -66,7 +74,7 @@ namespace · 5 unmodified lines
6674 void *new_page()
6775 {
6876 auto current_stack_page = top_page;
69− top_page = alloc_memory<vm_stack_page>(sizeof(vm_stack_page) + stack_page_size);
77+ top_page = disvm::runtime::alloc_memory<vm_stack_page>(sizeof(vm_stack_page) + stack_page_size);
7078
7179 // Initialize the stack allocation.
7280 top_page->prev_page = current_stack_page;
@@ -75,8 +83,8 @@ namespace · 2 unmodified lines
7583 top_page->page_top_frame = nullptr;
7684 top_page->page_limit_addr = reinterpret_cast<std::uintptr_t>(top_page)+stack_page_size;
7785
78− if (debug::is_component_tracing_enabled<debug::component_trace_t::memory>())
79− debug::log_msg(debug::component_trace_t::memory, debug::log_level_t::debug, "alloc: vm stack alloc: %#" PRIxPTR " %#" PRIxPTR, top_page, top_page->page_limit_addr);
86+ if (disvm::debug::is_component_tracing_enabled<component_trace_t::memory>())
87+ disvm::debug::log_msg(component_trace_t::memory, log_level_t::debug, "alloc: vm stack alloc: %#" PRIxPTR " %#" PRIxPTR, top_page, top_page->page_limit_addr);
8088
8189 return top_page->stack_data();
8290 }
@@ -87,10 +95,10 @@ namespace · 4 unmodified lines
8795 auto current_stack_page = top_page->prev_page;
8896 assert(current_stack_page != nullptr);
8997
90− free_memory(top_page);
98+ disvm::runtime::free_memory(top_page);
9199
92− if (debug::is_component_tracing_enabled<debug::component_trace_t::memory>())
93− debug::log_msg(debug::component_trace_t::memory, debug::log_level_t::debug, "free: vm stack alloc");
100+ if (disvm::debug::is_component_tracing_enabled<component_trace_t::memory>())
101+ disvm::debug::log_msg(component_trace_t::memory, log_level_t::debug, "free: vm stack alloc");
94102
95103 // Set the top page
96104 top_page = current_stack_page;
@@ -110,8 +118,8 @@ vm_frame_t::vm_frame_t(std::shared_ptr<const type_descriptor_t> &td) · 13 unmodified lines
110118 prev_frame() = nullptr;
111119 prev_module_ref() = nullptr;
112120
113− if (debug::is_component_tracing_enabled<debug::component_trace_t::memory>())
114− debug::log_msg(debug::component_trace_t::memory, debug::log_level_t::debug, "init: vm frame: %#" PRIxPTR " %d", this, frame_type->size_in_bytes);
121+ if (disvm::debug::is_component_tracing_enabled<component_trace_t::memory>())
122+ disvm::debug::log_msg(component_trace_t::memory, log_level_t::debug, "init: vm frame: %#" PRIxPTR " %d", this, frame_type->size_in_bytes);
115123 }
116124
117125 vm_frame_t::~vm_frame_t()
@@ -120,8 +128,8 @@ vm_frame_t::~vm_frame_t() · 2 unmodified lines
120128
121129 destroy_memory(*frame_type, base());
122130
123− if (debug::is_component_tracing_enabled<debug::component_trace_t::memory>())
124− debug::log_msg(debug::component_trace_t::memory, debug::log_level_t::debug, "destroy: vm frame: %#" PRIxPTR, this);
131+ if (disvm::debug::is_component_tracing_enabled<component_trace_t::memory>())
132+ disvm::debug::log_msg(component_trace_t::memory, log_level_t::debug, "destroy: vm frame: %#" PRIxPTR, this);
125133 }
126134
127135 void vm_frame_t::copy_frame_contents(const vm_frame_t &other)
@@ -181,7 +189,7 @@ vm_stack_t::vm_stack_t(std::size_t stack_extent) · 53 unmodified lines
181189 : _mem{ std::make_unique<vm_stack_layout>(stack_extent) }
182190 {
183191 assert(0 < stack_extent && stack_extent < static_cast<std::size_t>(std::numeric_limits<word_t>::max()));
184− debug::log_msg(debug::component_trace_t::memory, debug::log_level_t::debug, "init: vm stack");
192+ log_msg(component_trace_t::memory, log_level_t::debug, "init: vm stack");
185193 }
186194
187195 vm_stack_t::~vm_stack_t()
@@ -195,7 +203,7 @@ vm_stack_t::~vm_stack_t() · 7 unmodified lines
195203 _mem->release();
196204 _mem.reset();
197205
198− debug::log_msg(debug::component_trace_t::memory, debug::log_level_t::debug, "destroy: vm stack");
206+ log_msg(component_trace_t::memory, log_level_t::debug, "destroy: vm stack");
199207 }
200208
201209 vm_frame_t *vm_stack_t::alloc_frame(std::shared_ptr<const type_descriptor_t> frame_type)
@@ -244,8 +252,8 @@ vm_frame_t *vm_stack_t::push_frame() · 42 unmodified lines
244252
245253 layout->top_frame = new_top_frame;
246254
247− if (debug::is_component_tracing_enabled<debug::component_trace_t::stack>())
248− debug::log_msg(debug::component_trace_t::stack, debug::log_level_t::debug, "update: push vm frame: %#" PRIxPTR, new_top_frame);
255+ if (disvm::debug::is_component_tracing_enabled<component_trace_t::stack>())
256+ log_msg(component_trace_t::stack, log_level_t::debug, "update: push vm frame: %#" PRIxPTR, new_top_frame);
249257
250258 return new_top_frame;
251259 }
@@ -284,8 +292,8 @@ vm_frame_t *vm_stack_t::pop_frame() · 32 unmodified lines
284292 }
285293 }
286294
287− if (debug::is_component_tracing_enabled<debug::component_trace_t::stack>())
288− debug::log_msg(debug::component_trace_t::stack, debug::log_level_t::debug, "update: pop vm frame: %#" PRIxPTR, current_frame);
295+ if (disvm::debug::is_component_tracing_enabled<component_trace_t::stack>())
296+ log_msg(component_trace_t::stack, log_level_t::debug, "update: pop vm frame: %#" PRIxPTR, current_frame);
289297
290298 return current_frame;
291299 }