Browse files

Remaining 32-bit Darwin fixes.

  • Loading branch information...
1 parent 4641fd0 commit b9d371e93ea07653eb9c068281474963a0989abe @nelhage committed Mar 11, 2015
Showing with 4 additions and 5 deletions.
  1. +2 −2 bt.cpp
  2. +2 −3 bt_helper_32.S
View
4 bt.cpp
@@ -640,7 +640,7 @@ void bt_run(beta_cpu *cpu) {
return;
}
-#ifdef __i686__
+#ifdef __i386__
cpu->segment = bt_setup_cpu_segment(cpu);
#endif
bt_setup_segv_handler();
@@ -716,7 +716,7 @@ void bt_translate_and_run(beta_cpu *cpu, uint32_t exact, ccbuff chainptr) {
LOG("Chaining to frag 0x%08x", cfrag->start_pc);
}
-#ifdef __i686__
+#ifdef __i386__
__asm__("movw %%ax, %%fs\n" :: "a"(cpu->segment<<3|0x7));
#endif
bt_enter(cfrag->code);
View
5 bt_helper_32.S
@@ -38,10 +38,10 @@
_(bt_interp_one):
SAVE_CPU 0
- subl $4, %esp
+ subl $12, %esp
movl %ebp, %eax
call _(bt_step_one)
- addl $4, %esp
+ addl $12, %esp
LOAD_CPU
ret
@@ -91,7 +91,6 @@ _(bt_continue_ic):
_(bt_enter):
mov 4(%esp), %ecx
mov _(bt_stack_base), %esp
- subl $8, %esp
mov $_(CPU), %ebp
LOAD_CPU
jmp *%ecx

0 comments on commit b9d371e

Please sign in to comment.