Mercurial > repos > blastem
diff runtime.S @ 321:146c87616b05
Don't update interrupt mask on non-interrupt exceptions
author | Mike Pavone <pavone@retrodev.com> |
---|---|
date | Sat, 11 May 2013 21:19:31 -0700 |
parents | 67b6d351df0e |
children | 467bfa17004a |
line wrap: on
line diff
--- a/runtime.S Sat May 11 01:57:41 2013 -0700 +++ b/runtime.S Sat May 11 21:19:31 2013 -0700 @@ -45,6 +45,9 @@ mov %cx, 6(%rsi) /* interrupt acknowlege */ shl $2, %ecx add $0x60, %ecx + /* push %rcx + call debug_print_sr_int + pop %rcx */ call m68k_read_long_scratch1 call m68k_native_addr_and_sync add $24, %eax @@ -64,6 +67,33 @@ skip_sync_int: ret +sr_msg_int: + .asciz "SR set to $%X due to interrupt\n" +debug_print_sr_int: + call m68k_save_context + push %rsi + lea sr_msg_int(%rip), %rdi + movzxb 5(%rsi), %rsi + xor %rax, %rax + call printf + pop %rsi + call m68k_load_context + ret + +sr_msg: + .asciz "SR set to $%X\n" + .global debug_print_sr +debug_print_sr: + call m68k_save_context + push %rsi + lea sr_msg(%rip), %rdi + movzxb 5(%rsi), %rsi + xor %rax, %rax + call printf + pop %rsi + call m68k_load_context + ret + .global m68k_trap m68k_trap: push %rdi @@ -85,11 +115,8 @@ mov %r15d, %edi call get_sr call m68k_write_word - /* update status register */ - andb $0xF8, 5(%rsi) - mov 92(%rsi), %cl - or $0x20, %cl - or %cl, 5(%rsi) + /* set supervisor bit */ + or $0x20, 5(%rsi) /* calculate interrupt vector address */ pop %rcx shl $2, %ecx @@ -212,6 +239,7 @@ mov %cl, (%rsi) shr $8, %cx mov %cl, 5(%rsi) + /* call debug_print_sr */ ret .global set_ccr