Raymond Toy pushed to branch issue-97-define-ud2-inst at cmucl / cmucl

Commits:

1 changed file:

Changes:

  • src/lisp/x86-assem.S
    ... ... @@ -28,7 +28,7 @@
    28 28
      *
    
    29 29
      * Also, clang doesn't recognize the ud1 instruction.
    
    30 30
      */
    
    31
    -#define TRAP_CODE(code) \
    
    31
    +#define UD1(code) \
    
    32 32
     	.byte 0x0f		; \
    
    33 33
     	.byte 0xb9		; \
    
    34 34
     	.byte 0xc0 + code
    
    ... ... @@ -259,7 +259,7 @@ ENDFUNC(sse_restore)
    259 259
      * The undefined-function trampoline.
    
    260 260
      */
    
    261 261
     FUNCDEF(undefined_tramp)
    
    262
    -	TRAP_CODE(trap_Error)
    
    262
    +	UD1(trap_Error)
    
    263 263
             /* Number of argument bytes */
    
    264 264
             .byte   2
    
    265 265
     	.byte	UNDEFINED_SYMBOL_ERROR
    
    ... ... @@ -300,7 +300,7 @@ multiple_value_return:
    300 300
     	
    
    301 301
     	.globl GNAME(function_end_breakpoint_trap)
    
    302 302
     GNAME(function_end_breakpoint_trap):
    
    303
    -	TRAP_CODE(trap_FunctionEndBreakpoint)
    
    303
    +	UD1(trap_FunctionEndBreakpoint)
    
    304 304
     	hlt			# Should never return here.
    
    305 305
     ENDFUNC(function_end_breakpoint_trap)
    
    306 306
     
    
    ... ... @@ -308,20 +308,20 @@ ENDFUNC(function_end_breakpoint_trap)
    308 308
     GNAME(function_end_breakpoint_end):
    
    309 309
     
    
    310 310
     FUNCDEF(do_pending_interrupt)
    
    311
    -	TRAP_CODE(trap_PendingInterrupt)
    
    311
    +	UD1(trap_PendingInterrupt)
    
    312 312
     	ret
    
    313 313
     ENDFUNC(do_pending_interrupt)
    
    314 314
     	
    
    315 315
     #ifdef trap_DynamicSpaceOverflowError
    
    316 316
     FUNCDEF(do_dynamic_space_overflow_error)
    
    317
    -	TRAP_CODE(trap_DynamicSpaceOverflowError)
    
    317
    +	UD1(trap_DynamicSpaceOverflowError)
    
    318 318
     	ret
    
    319 319
     ENDFUNC(do_dynamic_space_overflow_error)
    
    320 320
     #endif				
    
    321 321
     	
    
    322 322
     #ifdef trap_DynamicSpaceOverflowWarning
    
    323 323
     FUNCDEF(do_dynamic_space_overflow_warning)
    
    324
    -	TRAP_CODE(trap_DynamicSpaceOverflowWarning)
    
    324
    +	UD1(trap_DynamicSpaceOverflowWarning)
    
    325 325
     	ret
    
    326 326
     ENDFUNC(do_dynamic_space_overflow_warning)
    
    327 327
     #endif				
    
    ... ... @@ -503,7 +503,7 @@ FUNCDEF(undefined_foreign_symbol_trap)
    503 503
             movl 8(%ebp),%eax
    
    504 504
     
    
    505 505
     	/* Now trap to Lisp */
    
    506
    -	TRAP_CODE(trap_Error)
    
    506
    +	UD1(trap_Error)
    
    507 507
             /* Number of argument bytes */
    
    508 508
             .byte   2
    
    509 509
     	.byte	UNDEFINED_FOREIGN_SYMBOL_ERROR