Put brackets around ipv6 addresses in `inet6 present`

[factor.git] / vm / cpu-x86.hpp

diff --git a/vm/cpu-x86.hpp b/vm/cpu-x86.hpp
index 6471c0f2a8c29dbbd77efae2f71fc94db94fc745..a0d83b5d78d3b5ea2a82827133eb28c37960cced 100644 (file)
--- a/vm/cpu-x86.hpp
+++ b/vm/cpu-x86.hpp
@@ -1,27 +1,18 @@
 namespace factor {
 
-inline static void* frame_return_address(void* frame_top) {
-  return *(void**)frame_top;
-}
-
-inline static void set_frame_return_address(void* frame_top,
-                                            void* return_address) {
-  *(void**)frame_top = return_address;
-}
-
 #define CALLSTACK_BOTTOM(ctx) \
-  (void*)(ctx->callstack_seg->end - sizeof(cell) * 5)
+  (ctx->callstack_seg->end - sizeof(cell) * 5)
 
-inline static void flush_icache(cell start, cell len) {}
+inline static void flush_icache(cell start, cell len) { (void)start; (void)len; }
 
-/* In the instruction sequence:
+// In the instruction sequence:
 
-   MOV EBX,...
-   JMP blah
+// MOV EBX,...
+// JMP blah
 
-   the offset from the immediate operand to MOV to the instruction after
-   the jump is a cell for the immediate operand, 4 bytes for the JMP
-   destination, and one byte for the JMP opcode. */
+// the offset from the immediate operand to MOV to the instruction after
+// the jump is a cell for the immediate operand, 4 bytes for the JMP
+// destination, and one byte for the JMP opcode.
 static const fixnum xt_tail_pic_offset = 4 + 1;
 
 static const unsigned char call_opcode = 0xe8;
@@ -34,7 +25,7 @@ inline static unsigned char call_site_opcode(cell return_address) {
 inline static void check_call_site(cell return_address) {
   unsigned char opcode = call_site_opcode(return_address);
   FACTOR_ASSERT(opcode == call_opcode || opcode == jmp_opcode);
-  (void) opcode;  // suppress warning when compiling without assertions
+  (void)opcode; // suppress warning when compiling without assertions
 }
 
 inline static void* get_call_target(cell return_address) {
@@ -42,9 +33,9 @@ inline static void* get_call_target(cell return_address) {
   return (void*)(*(int*)(return_address - 4) + return_address);
 }
 
-inline static void set_call_target(cell return_address, void* target) {
+inline static void set_call_target(cell return_address, cell target) {
   check_call_site(return_address);
-  *(int*)(return_address - 4) = (u32)((cell) target - return_address);
+  *(int*)(return_address - 4) = (uint32_t)(target - return_address);
 }
 
 inline static bool tail_call_site_p(cell return_address) {