From debdb11538686b926b909c34d08a999f8b5b9b55 Mon Sep 17 00:00:00 2001 From: Erik Charlebois Date: Sat, 11 May 2013 22:27:19 -0400 Subject: [PATCH] VM: Refactor run.cpp/hpp to Factor style --- vm/run.cpp | 44 +++++++++++++++++--------------------------- vm/run.hpp | 3 +-- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/vm/run.cpp b/vm/run.cpp index f26e99bcda..a943a2cc43 100644 --- a/vm/run.cpp +++ b/vm/run.cpp @@ -1,37 +1,27 @@ #include "master.hpp" -namespace factor -{ +namespace factor { -void factor_vm::primitive_exit() -{ - exit((int)to_fixnum(ctx->pop())); -} +void factor_vm::primitive_exit() { exit((int) to_fixnum(ctx->pop())); } -void exit(int status) -{ - factor_vm::close_console(); - ::exit(status); +void exit(int status) { + factor_vm::close_console(); + ::exit(status); } -void factor_vm::primitive_nano_count() -{ - u64 nanos = nano_count(); - if(nanos < last_nano_count) - { - std::cout << "Monotonic counter decreased from 0x"; - std::cout << std::hex << last_nano_count; - std::cout << " to 0x" << nanos << "." << std::dec << "\n"; - std::cout << "Please report this error.\n"; - current_vm()->factorbug(); - } - last_nano_count = nanos; - ctx->push(from_unsigned_8(nanos)); +void factor_vm::primitive_nano_count() { + u64 nanos = nano_count(); + if (nanos < last_nano_count) { + std::cout << "Monotonic counter decreased from 0x"; + std::cout << std::hex << last_nano_count; + std::cout << " to 0x" << nanos << "." << std::dec << "\n"; + std::cout << "Please report this error.\n"; + current_vm()->factorbug(); + } + last_nano_count = nanos; + ctx->push(from_unsigned_8(nanos)); } -void factor_vm::primitive_sleep() -{ - sleep_nanos(to_unsigned_8(ctx->pop())); -} +void factor_vm::primitive_sleep() { sleep_nanos(to_unsigned_8(ctx->pop())); } } diff --git a/vm/run.hpp b/vm/run.hpp index d3d8e3f949..683448d37c 100644 --- a/vm/run.hpp +++ b/vm/run.hpp @@ -1,5 +1,4 @@ -namespace factor -{ +namespace factor { void abort(); void exit(int status); -- 2.34.1