-#ifndef __i386__
- printf("0x%08lX:\n\tuwp: 0x%08lX\n\tfp: 0x%08lX\n\tcode: 0x%08lx\n\tentry: 0x%08lx\n\ttag: ",
- (unsigned long)catch, (unsigned long)(catch->current_uwp),
- (unsigned long)(catch->current_cont),
- catch->current_code,
- catch->entry_pc);
+ printf("0x%08lX:\n\tuwp: 0x%08lX\n\tfp: 0x%08lX\n\t"
+ "code: 0x%08lX\n\tentry: 0x%08lX\n\ttag: ",
+ (unsigned long)catch,
+ (unsigned long)(catch->current_uwp),
+ (unsigned long)(catch->current_cont),
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
+ (unsigned long)component_ptr_from_pc((void*)catch->entry_pc)
+ + OTHER_POINTER_LOWTAG,