[ViewVC] Diff of: cebix/BasiliskII/src/Unix/sigsegv.cpp

Comparing BasiliskII/src/Unix/sigsegv.cpp (file contents):
Revision 1.78 by gbeauche, 2008-01-07T22:44:39Z vs.
Revision 1.81 by gbeauche, 2008-01-19T22:25:27Z

#	Line 49 \| Line 49 \| using std::list;
49		#define RETSIGTYPE void
50		#endif
51
52	+	// Size of an unsigned integer large enough to hold all bits of a pointer
53	+	// NOTE: this can be different than SIGSEGV_REGISTER_TYPE. In
54	+	// particular, on ILP32 systems with a 64-bit kernel (HP-UX/ia64?)
55	+	#ifdef HAVE_WIN32_VM
56	+	// Windows is either ILP32 or LLP64
57	+	typedef UINT_PTR sigsegv_uintptr_t;
58	+	#else
59	+	// Other systems are sane enough to follow ILP32 or LP64 models
60	+	typedef unsigned long sigsegv_uintptr_t;
61	+	#endif
62	+
63		// Type of the system signal handler
64		typedef RETSIGTYPE (*signal_handler)(int);
65
#	Line 264 \| Line 275 \| static void powerpc_decode_instruction(i
275		#include <sys/regset.h>
276		#define SIGSEGV_CONTEXT_REGS (((ucontext_t *)scp)->uc_mcontext.gregs)
277		#define SIGSEGV_FAULT_INSTRUCTION SIGSEGV_CONTEXT_REGS[EIP]
278	<	#define SIGSEGV_REGISTER_FILE (unsigned long *)SIGSEGV_CONTEXT_REGS
278	>	#define SIGSEGV_REGISTER_FILE (SIGSEGV_REGISTER_TYPE *)SIGSEGV_CONTEXT_REGS
279		#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction
280		#endif
281		#endif
282		#if defined(__FreeBSD__) \|\| defined(__OpenBSD__)
283		#if (defined(i386) \|\| defined(__i386__))
284		#define SIGSEGV_FAULT_INSTRUCTION (((struct sigcontext *)scp)->sc_eip)
285	<	#define SIGSEGV_REGISTER_FILE ((unsigned long )&(((struct sigcontext )scp)->sc_edi)) /* EDI is the first GPR (even below EIP) in sigcontext */
285	>	#define SIGSEGV_REGISTER_FILE ((SIGSEGV_REGISTER_TYPE )&(((struct sigcontext )scp)->sc_edi)) /* EDI is the first GPR (even below EIP) in sigcontext */
286		#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction
287		#endif
288		#endif
#	Line 280 \| Line 291 \| static void powerpc_decode_instruction(i
291		#include <sys/ucontext.h>
292		#define SIGSEGV_CONTEXT_REGS (((ucontext_t *)scp)->uc_mcontext.__gregs)
293		#define SIGSEGV_FAULT_INSTRUCTION SIGSEGV_CONTEXT_REGS[_REG_EIP]
294	<	#define SIGSEGV_REGISTER_FILE (unsigned long *)SIGSEGV_CONTEXT_REGS
294	>	#define SIGSEGV_REGISTER_FILE (SIGSEGV_REGISTER_TYPE *)SIGSEGV_CONTEXT_REGS
295		#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction
296		#endif
297		#if (defined(powerpc) \|\| defined(__powerpc__))
#	Line 296 \| Line 307 \| static void powerpc_decode_instruction(i
307		#include <sys/ucontext.h>
308		#define SIGSEGV_CONTEXT_REGS (((ucontext_t *)scp)->uc_mcontext.gregs)
309		#define SIGSEGV_FAULT_INSTRUCTION SIGSEGV_CONTEXT_REGS[14] /* should use REG_EIP instead */
310	<	#define SIGSEGV_REGISTER_FILE (unsigned long *)SIGSEGV_CONTEXT_REGS
310	>	#define SIGSEGV_REGISTER_FILE (SIGSEGV_REGISTER_TYPE *)SIGSEGV_CONTEXT_REGS
311		#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction
312		#endif
313		#if (defined(x86_64) \|\| defined(__x86_64__))
314		#include <sys/ucontext.h>
315		#define SIGSEGV_CONTEXT_REGS (((ucontext_t *)scp)->uc_mcontext.gregs)
316		#define SIGSEGV_FAULT_INSTRUCTION SIGSEGV_CONTEXT_REGS[16] /* should use REG_RIP instead */
317	<	#define SIGSEGV_REGISTER_FILE (unsigned long *)SIGSEGV_CONTEXT_REGS
317	>	#define SIGSEGV_REGISTER_FILE (SIGSEGV_REGISTER_TYPE *)SIGSEGV_CONTEXT_REGS
318		#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction
319		#endif
320		#if (defined(ia64) \|\| defined(__ia64__))
#	Line 351 \| Line 362 \| static void powerpc_decode_instruction(i
362		#define SIGSEGV_FAULT_HANDLER_ARGS &scs
363		#define SIGSEGV_FAULT_ADDRESS scp->cr2
364		#define SIGSEGV_FAULT_INSTRUCTION scp->eip
365	<	#define SIGSEGV_REGISTER_FILE (unsigned long *)scp
365	>	#define SIGSEGV_REGISTER_FILE (SIGSEGV_REGISTER_TYPE *)scp
366		#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction
367		#endif
368		#if (defined(sparc) \|\| defined(__sparc__))
#	Line 472 \| Line 483 \| static sigsegv_address_t get_fault_addre
483		#define SIGSEGV_FAULT_HANDLER_ARGS sig, code, scp, addr
484		#define SIGSEGV_FAULT_ADDRESS addr
485		#define SIGSEGV_FAULT_INSTRUCTION scp->sc_eip
486	<	#define SIGSEGV_REGISTER_FILE ((unsigned long *)&scp->sc_edi)
486	>	#define SIGSEGV_REGISTER_FILE ((SIGSEGV_REGISTER_TYPE *)&scp->sc_edi)
487		#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction
488		#endif
489		#if (defined(alpha) \|\| defined(__alpha__))
#	Line 535 \| Line 546 \| static sigsegv_address_t get_fault_addre
546		#include <windows.h>
547		#include <winerror.h>
548
549	+	#if defined(_M_IX86)
550		#define SIGSEGV_FAULT_HANDLER_ARGLIST EXCEPTION_POINTERS *ExceptionInfo
551		#define SIGSEGV_FAULT_HANDLER_ARGS ExceptionInfo
552		#define SIGSEGV_FAULT_ADDRESS ExceptionInfo->ExceptionRecord->ExceptionInformation[1]
553		#define SIGSEGV_CONTEXT_REGS ExceptionInfo->ContextRecord
554		#define SIGSEGV_FAULT_INSTRUCTION SIGSEGV_CONTEXT_REGS->Eip
555	<	#define SIGSEGV_REGISTER_FILE ((unsigned long *)&SIGSEGV_CONTEXT_REGS->Edi)
555	>	#define SIGSEGV_REGISTER_FILE ((SIGSEGV_REGISTER_TYPE *)&SIGSEGV_CONTEXT_REGS->Edi)
556	>	#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction
557	>	#endif
558	>	#if defined(_M_X64)
559	>	#define SIGSEGV_FAULT_HANDLER_ARGLIST EXCEPTION_POINTERS *ExceptionInfo
560	>	#define SIGSEGV_FAULT_HANDLER_ARGS ExceptionInfo
561	>	#define SIGSEGV_FAULT_ADDRESS ExceptionInfo->ExceptionRecord->ExceptionInformation[1]
562	>	#define SIGSEGV_CONTEXT_REGS ExceptionInfo->ContextRecord
563	>	#define SIGSEGV_FAULT_INSTRUCTION SIGSEGV_CONTEXT_REGS->Rip
564	>	#define SIGSEGV_REGISTER_FILE ((SIGSEGV_REGISTER_TYPE *)&SIGSEGV_CONTEXT_REGS->Rax)
565		#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction
566		#endif
567	+	#endif
568
569		#if HAVE_MACH_EXCEPTIONS
570
#	Line 605 \| Line 627 \| if (ret != KERN_SUCCESS) { \
627		}
628
629		#ifdef __ppc__
630	+	#if __DARWIN_UNIX03 && defined _STRUCT_PPC_THREAD_STATE
631	+	#define MACH_FIELD_NAME(X) __CONCAT(__,X)
632	+	#endif
633		#define SIGSEGV_EXCEPTION_STATE_TYPE ppc_exception_state_t
634		#define SIGSEGV_EXCEPTION_STATE_FLAVOR PPC_EXCEPTION_STATE
635		#define SIGSEGV_EXCEPTION_STATE_COUNT PPC_EXCEPTION_STATE_COUNT
636	<	#define SIGSEGV_FAULT_ADDRESS SIP->exc_state.dar
636	>	#define SIGSEGV_FAULT_ADDRESS SIP->exc_state.MACH_FIELD_NAME(dar)
637		#define SIGSEGV_THREAD_STATE_TYPE ppc_thread_state_t
638		#define SIGSEGV_THREAD_STATE_FLAVOR PPC_THREAD_STATE
639		#define SIGSEGV_THREAD_STATE_COUNT PPC_THREAD_STATE_COUNT
640	<	#define SIGSEGV_FAULT_INSTRUCTION SIP->thr_state.srr0
640	>	#define SIGSEGV_FAULT_INSTRUCTION SIP->thr_state.MACH_FIELD_NAME(srr0)
641		#define SIGSEGV_SKIP_INSTRUCTION powerpc_skip_instruction
642	<	#define SIGSEGV_REGISTER_FILE (unsigned long )&SIP->thr_state.srr0, (unsigned long )&SIP->thr_state.r0
642	>	#define SIGSEGV_REGISTER_FILE (unsigned long )&SIP->thr_state.MACH_FIELD_NAME(srr0), (unsigned long )&SIP->thr_state.MACH_FIELD_NAME(r0)
643		#endif
644		#ifdef __ppc64__
645	+	#if __DARWIN_UNIX03 && defined _STRUCT_PPC_THREAD_STATE64
646	+	#define MACH_FIELD_NAME(X) __CONCAT(__,X)
647	+	#endif
648		#define SIGSEGV_EXCEPTION_STATE_TYPE ppc_exception_state64_t
649		#define SIGSEGV_EXCEPTION_STATE_FLAVOR PPC_EXCEPTION_STATE64
650		#define SIGSEGV_EXCEPTION_STATE_COUNT PPC_EXCEPTION_STATE64_COUNT
651	<	#define SIGSEGV_FAULT_ADDRESS SIP->exc_state.dar
651	>	#define SIGSEGV_FAULT_ADDRESS SIP->exc_state.MACH_FIELD_NAME(dar)
652		#define SIGSEGV_THREAD_STATE_TYPE ppc_thread_state64_t
653		#define SIGSEGV_THREAD_STATE_FLAVOR PPC_THREAD_STATE64
654		#define SIGSEGV_THREAD_STATE_COUNT PPC_THREAD_STATE64_COUNT
655	<	#define SIGSEGV_FAULT_INSTRUCTION SIP->thr_state.srr0
655	>	#define SIGSEGV_FAULT_INSTRUCTION SIP->thr_state.MACH_FIELD_NAME(srr0)
656		#define SIGSEGV_SKIP_INSTRUCTION powerpc_skip_instruction
657	<	#define SIGSEGV_REGISTER_FILE (unsigned long )&SIP->thr_state.srr0, (unsigned long )&SIP->thr_state.r0
657	>	#define SIGSEGV_REGISTER_FILE (unsigned long )&SIP->thr_state.MACH_FIELD_NAME(srr0), (unsigned long )&SIP->thr_state.MACH_FIELD_NAME(r0)
658		#endif
659		#ifdef __i386__
660	<	#define SIGSEGV_EXCEPTION_STATE_TYPE struct i386_exception_state
660	>	#if __DARWIN_UNIX03 && defined _STRUCT_X86_THREAD_STATE32
661	>	#define MACH_FIELD_NAME(X) __CONCAT(__,X)
662	>	#endif
663	>	#define SIGSEGV_EXCEPTION_STATE_TYPE i386_exception_state_t
664		#define SIGSEGV_EXCEPTION_STATE_FLAVOR i386_EXCEPTION_STATE
665		#define SIGSEGV_EXCEPTION_STATE_COUNT i386_EXCEPTION_STATE_COUNT
666	<	#define SIGSEGV_FAULT_ADDRESS SIP->exc_state.faultvaddr
667	<	#define SIGSEGV_THREAD_STATE_TYPE struct i386_thread_state
666	>	#define SIGSEGV_FAULT_ADDRESS SIP->exc_state.MACH_FIELD_NAME(faultvaddr)
667	>	#define SIGSEGV_THREAD_STATE_TYPE i386_thread_state_t
668		#define SIGSEGV_THREAD_STATE_FLAVOR i386_THREAD_STATE
669		#define SIGSEGV_THREAD_STATE_COUNT i386_THREAD_STATE_COUNT
670	<	#define SIGSEGV_FAULT_INSTRUCTION SIP->thr_state.eip
670	>	#define SIGSEGV_FAULT_INSTRUCTION SIP->thr_state.MACH_FIELD_NAME(eip)
671		#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction
672	<	#define SIGSEGV_REGISTER_FILE ((unsigned long )&SIP->thr_state.eax) / EAX is the first GPR we consider */
672	>	#define SIGSEGV_REGISTER_FILE ((SIGSEGV_REGISTER_TYPE )&SIP->thr_state.MACH_FIELD_NAME(eax)) / EAX is the first GPR we consider */
673		#endif
674		#ifdef __x86_64__
675	<	#define SIGSEGV_EXCEPTION_STATE_TYPE struct x86_exception_state64
675	>	#if __DARWIN_UNIX03 && defined _STRUCT_X86_THREAD_STATE64
676	>	#define MACH_FIELD_NAME(X) __CONCAT(__,X)
677	>	#endif
678	>	#define SIGSEGV_EXCEPTION_STATE_TYPE x86_exception_state64_t
679		#define SIGSEGV_EXCEPTION_STATE_FLAVOR x86_EXCEPTION_STATE64
680		#define SIGSEGV_EXCEPTION_STATE_COUNT x86_EXCEPTION_STATE64_COUNT
681	<	#define SIGSEGV_FAULT_ADDRESS SIP->exc_state.faultvaddr
682	<	#define SIGSEGV_THREAD_STATE_TYPE struct x86_thread_state64
681	>	#define SIGSEGV_FAULT_ADDRESS SIP->exc_state.MACH_FIELD_NAME(faultvaddr)
682	>	#define SIGSEGV_THREAD_STATE_TYPE x86_thread_state64_t
683		#define SIGSEGV_THREAD_STATE_FLAVOR x86_THREAD_STATE64
684		#define SIGSEGV_THREAD_STATE_COUNT x86_THREAD_STATE64_COUNT
685	<	#define SIGSEGV_FAULT_INSTRUCTION SIP->thr_state.rip
685	>	#define SIGSEGV_FAULT_INSTRUCTION SIP->thr_state.MACH_FIELD_NAME(rip)
686		#define SIGSEGV_SKIP_INSTRUCTION ix86_skip_instruction
687	<	#define SIGSEGV_REGISTER_FILE ((unsigned long )&SIP->thr_state.rax) / RAX is the first GPR we consider */
687	>	#define SIGSEGV_REGISTER_FILE ((SIGSEGV_REGISTER_TYPE )&SIP->thr_state.MACH_FIELD_NAME(rax)) / RAX is the first GPR we consider */
688		#endif
689		#define SIGSEGV_FAULT_ADDRESS_FAST code[1]
690		#define SIGSEGV_FAULT_INSTRUCTION_FAST SIGSEGV_INVALID_ADDRESS
691		#define SIGSEGV_FAULT_HANDLER_ARGLIST mach_port_t thread, exception_data_t code
692		#define SIGSEGV_FAULT_HANDLER_ARGS thread, code
693
694	+	#ifndef MACH_FIELD_NAME
695	+	#define MACH_FIELD_NAME(X) X
696	+	#endif
697	+
698		// Since there can only be one exception thread running at any time
699		// this is not a problem.
700		#define MSG_SIZE 512
#	Line 708 \| Line 746 \| *handleExceptions(void priv)**
746		* Instruction skipping
747		*/
748
749	+	#ifndef SIGSEGV_REGISTER_TYPE
750	+	#define SIGSEGV_REGISTER_TYPE sigsegv_uintptr_t
751	+	#endif
752	+
753		#ifdef HAVE_SIGSEGV_SKIP_INSTRUCTION
754		// Decode and skip X86 instruction
755	<	#if (defined(i386) \|\| defined(__i386__)) \|\| defined(__x86_64__)
755	>	#if (defined(i386) \|\| defined(__i386__)) \|\| (defined(__x86_64__) \|\| defined(_M_X64))
756		#if defined(__linux__)
757		enum {
758		#if (defined(i386) \|\| defined(__i386__))
#	Line 861 \| Line 903 \| enum {
903		#endif
904		#if defined(_WIN32)
905		enum {
906	<	#if (defined(i386) \|\| defined(__i386__))
906	>	#if defined(_M_IX86)
907		X86_REG_EIP = 7,
908		X86_REG_EAX = 5,
909		X86_REG_ECX = 4,
#	Line 872 \| Line 914 \| enum {
914		X86_REG_ESI = 1,
915		X86_REG_EDI = 0
916		#endif
917	+	#if defined(_M_X64)
918	+	X86_REG_EAX = 0,
919	+	X86_REG_ECX = 1,
920	+	X86_REG_EDX = 2,
921	+	X86_REG_EBX = 3,
922	+	X86_REG_ESP = 4,
923	+	X86_REG_EBP = 5,
924	+	X86_REG_ESI = 6,
925	+	X86_REG_EDI = 7,
926	+	X86_REG_R8 = 8,
927	+	X86_REG_R9 = 9,
928	+	X86_REG_R10 = 10,
929	+	X86_REG_R11 = 11,
930	+	X86_REG_R12 = 12,
931	+	X86_REG_R13 = 13,
932	+	X86_REG_R14 = 14,
933	+	X86_REG_R15 = 15,
934	+	X86_REG_EIP = 16
935	+	#endif
936		};
937		#endif
938		// FIXME: this is partly redundant with the instruction decoding phase
#	Line 908 \| Line 969 \| static inline int ix86_step_over_modrm(u
969		return offset;
970		}
971
972	<	static bool ix86_skip_instruction(unsigned long * regs)
972	>	static bool ix86_skip_instruction(SIGSEGV_REGISTER_TYPE * regs)
973		{
974		unsigned char * eip = (unsigned char *)regs[X86_REG_EIP];
975
#	Line 944 \| Line 1005 \| static bool ix86_skip_instruction(unsign
1005		}
1006
1007		// REX prefix
1008	<	#if defined(__x86_64__)
1008	>	#if defined(__x86_64__) \|\| defined(_M_X64)
1009		struct rex_t {
1010		unsigned char W;
1011		unsigned char R;
#	Line 996 \| Line 1057 \| static bool ix86_skip_instruction(unsign
1057		goto do_transfer_load;
1058		}
1059		break;
1060	<	#if defined(__x86_64__)
1060	>	#if defined(__x86_64__) \|\| defined(_M_X64)
1061		case 0x63: // MOVSXD r64, r/m32
1062		if (has_rex && rex.W) {
1063		transfer_size = SIZE_LONG;
#	Line 1067 \| Line 1128 \| static bool ix86_skip_instruction(unsign
1128		return false;
1129		}
1130
1131	<	#if defined(__x86_64__)
1131	>	#if defined(__x86_64__) \|\| defined(_M_X64)
1132		if (rex.R)
1133		reg += 8;
1134		#endif
#	Line 1076 \| Line 1137 \| static bool ix86_skip_instruction(unsign
1137		static const int x86_reg_map[] = {
1138		X86_REG_EAX, X86_REG_ECX, X86_REG_EDX, X86_REG_EBX,
1139		X86_REG_ESP, X86_REG_EBP, X86_REG_ESI, X86_REG_EDI,
1140	<	#if defined(__x86_64__)
1140	>	#if defined(__x86_64__) \|\| defined(_M_X64)
1141		X86_REG_R8, X86_REG_R9, X86_REG_R10, X86_REG_R11,
1142		X86_REG_R12, X86_REG_R13, X86_REG_R14, X86_REG_R15,
1143		#endif
#	Line 1165 \| Line 1226 \| static bool ix86_skip_instruction(unsign
1226
1227		// Decode and skip IA-64 instruction
1228		#if defined(__ia64__)
1229	+	typedef uint64_t ia64_bundle_t[2];
1230		#if defined(__linux__)
1231		// We can directly patch the slot number
1232	<	#define IA64_CAN_PATCH_IP_SLOT 1
1232	>	#define IA64_CAN_PATCH_IP_SLOT 1
1233		// Helper macros to access the machine context
1234		#define IA64_CONTEXT_TYPE struct sigcontext *
1235		#define IA64_CONTEXT scp
#	Line 1175 \| Line 1237 \| static bool ix86_skip_instruction(unsign
1237		#define IA64_SET_IP(V) (IA64_CONTEXT->sc_ip = (V))
1238		#define IA64_GET_PR(P) ((IA64_CONTEXT->sc_pr >> (P)) & 1)
1239		#define IA64_GET_NAT(I) ((IA64_CONTEXT->sc_nat >> (I)) & 1)
1178	–	#define IA64_SET_NAT(I,V) (IA64_CONTEXT->sc_nat= (IA64_CONTEXT->sc_nat & ~(1ul << (I))) \| (((unsigned long)!!(V)) << (I)))
1240		#define IA64_GET_GR(R) (IA64_CONTEXT->sc_gr[(R)])
1241	<	#define IA64_SET_GR(R,V) (IA64_CONTEXT->sc_gr[(R)] = (V))
1241	>	#define _IA64_SET_GR(R,V) (IA64_CONTEXT->sc_gr[(R)] = (V))
1242	>	#define _IA64_SET_NAT(I,V) (IA64_CONTEXT->sc_nat = (IA64_CONTEXT->sc_nat & ~(1ull << (I))) \| (((uint64_t)!!(V)) << (I)))
1243	>	#define IA64_SET_GR(R,V,N) (_IA64_SET_GR(R,V), _IA64_SET_NAT(R,N))
1244	>
1245	>	// Load bundle (in little-endian)
1246	>	static inline void ia64_load_bundle(ia64_bundle_t bundle, uint64_t raw_ip)
1247	>	{
1248	>	uint64_t ip = (uint64_t )(raw_ip & ~3ull);
1249	>	bundle[0] = ip[0];
1250	>	bundle[1] = ip[1];
1251	>	}
1252		#endif
1253
1254		// Instruction operations
#	Line 1219 \| Line 1290 \| const int IA64_N_OPERANDS = 4;
1290
1291		// Decoded operand type
1292		struct ia64_operand_t {
1293	<	unsigned char commit; // commit result of operation to register file?
1294	<	unsigned char valid; // XXX: not really used, can be removed (debug)
1295	<	signed char index; // index of GPR, or -1 if immediate value
1296	<	unsigned char nat; // NaT state before operation
1297	<	unsigned long value; // register contents or immediate value
1293	>	uint8_t commit; // commit result of operation to register file?
1294	>	uint8_t valid; // XXX: not really used, can be removed (debug)
1295	>	int8_t index; // index of GPR, or -1 if immediate value
1296	>	uint8_t nat; // NaT state before operation
1297	>	uint64_t value; // register contents or immediate value
1298		};
1299
1300		// Decoded instruction type
1301		struct ia64_instruction_t {
1302	<	unsigned char mnemo; // operation to perform
1303	<	unsigned char pred; // predicate register to check
1304	<	unsigned char no_memory; // used to emulated main fault instruction
1305	<	unsigned long inst; // the raw instruction bits (41-bit wide)
1302	>	uint8_t mnemo; // operation to perform
1303	>	uint8_t pred; // predicate register to check
1304	>	uint8_t no_memory; // used to emulated main fault instruction
1305	>	uint64_t inst; // the raw instruction bits (41-bit wide)
1306		ia64_operand_t operands[IA64_N_OPERANDS];
1307		};
1308
1309		// Get immediate sign-bit
1310	<	static inline int ia64_inst_get_sbit(unsigned long inst)
1310	>	static inline int ia64_inst_get_sbit(uint64_t inst)
1311		{
1312		return (inst >> 36) & 1;
1313		}
1314
1315		// Get 8-bit immediate value (A3, A8, I27, M30)
1316	<	static inline unsigned long ia64_inst_get_imm8(unsigned long inst)
1316	>	static inline uint64_t ia64_inst_get_imm8(uint64_t inst)
1317		{
1318	<	unsigned long value = (inst >> 13) & 0x7ful;
1318	>	uint64_t value = (inst >> 13) & 0x7full;
1319		if (ia64_inst_get_sbit(inst))
1320	<	value \|= ~0x7ful;
1320	>	value \|= ~0x7full;
1321		return value;
1322		}
1323
1324		// Get 9-bit immediate value (M3)
1325	<	static inline unsigned long ia64_inst_get_imm9b(unsigned long inst)
1325	>	static inline uint64_t ia64_inst_get_imm9b(uint64_t inst)
1326		{
1327	<	unsigned long value = (((inst >> 27) & 1) << 7) \| ((inst >> 13) & 0x7f);
1327	>	uint64_t value = (((inst >> 27) & 1) << 7) \| ((inst >> 13) & 0x7f);
1328		if (ia64_inst_get_sbit(inst))
1329	<	value \|= ~0xfful;
1329	>	value \|= ~0xffull;
1330		return value;
1331		}
1332
1333		// Get 9-bit immediate value (M5)
1334	<	static inline unsigned long ia64_inst_get_imm9a(unsigned long inst)
1334	>	static inline uint64_t ia64_inst_get_imm9a(uint64_t inst)
1335		{
1336	<	unsigned long value = (((inst >> 27) & 1) << 7) \| ((inst >> 6) & 0x7f);
1336	>	uint64_t value = (((inst >> 27) & 1) << 7) \| ((inst >> 6) & 0x7f);
1337		if (ia64_inst_get_sbit(inst))
1338	<	value \|= ~0xfful;
1338	>	value \|= ~0xffull;
1339		return value;
1340		}
1341
1342		// Get 14-bit immediate value (A4)
1343	<	static inline unsigned long ia64_inst_get_imm14(unsigned long inst)
1343	>	static inline uint64_t ia64_inst_get_imm14(uint64_t inst)
1344		{
1345	<	unsigned long value = (((inst >> 27) & 0x3f) << 7) \| (inst & 0x7f);
1345	>	uint64_t value = (((inst >> 27) & 0x3f) << 7) \| (inst & 0x7f);
1346		if (ia64_inst_get_sbit(inst))
1347	<	value \|= ~0x1fful;
1347	>	value \|= ~0x1ffull;
1348		return value;
1349		}
1350
1351		// Get 22-bit immediate value (A5)
1352	<	static inline unsigned long ia64_inst_get_imm22(unsigned long inst)
1352	>	static inline uint64_t ia64_inst_get_imm22(uint64_t inst)
1353		{
1354	<	unsigned long value = ((((inst >> 22) & 0x1f) << 16) \|
1355	<	(((inst >> 27) & 0x1ff) << 7) \|
1356	<	(inst & 0x7f));
1354	>	uint64_t value = ((((inst >> 22) & 0x1f) << 16) \|
1355	>	(((inst >> 27) & 0x1ff) << 7) \|
1356	>	(inst & 0x7f));
1357		if (ia64_inst_get_sbit(inst))
1358	<	value \|= ~0x1ffffful;
1358	>	value \|= ~0x1fffffull;
1359		return value;
1360		}
1361
1362		// Get 21-bit immediate value (I19)
1363	<	static inline unsigned long ia64_inst_get_imm21(unsigned long inst)
1363	>	static inline uint64_t ia64_inst_get_imm21(uint64_t inst)
1364		{
1365		return (((inst >> 36) & 1) << 20) \| ((inst >> 6) & 0xfffff);
1366		}
1367
1368		// Get 2-bit count value (A2)
1369	<	static inline int ia64_inst_get_count2(unsigned long inst)
1369	>	static inline int ia64_inst_get_count2(uint64_t inst)
1370		{
1371		return (inst >> 27) & 0x3;
1372		}
1373
1374		// Get bundle template
1375	<	static inline unsigned int ia64_get_template(unsigned long raw_ip)
1375	>	static inline unsigned int ia64_get_template(uint64_t ip)
1376		{
1377	<	unsigned long ip = (unsigned long )(raw_ip & ~3ul);
1378	<	return ip[0] & 0x1f;
1377	>	ia64_bundle_t bundle;
1378	>	ia64_load_bundle(bundle, ip);
1379	>	return bundle[0] & 0x1f;
1380		}
1381
1382		// Get specified instruction in bundle
1383	<	static unsigned long ia64_get_instruction(unsigned long raw_ip, int slot)
1383	>	static uint64_t ia64_get_instruction(uint64_t ip, int slot)
1384		{
1385	<	unsigned long inst;
1386	<	unsigned long ip = (unsigned long )(raw_ip & ~3ul);
1385	>	uint64_t inst;
1386	>	ia64_bundle_t bundle;
1387	>	ia64_load_bundle(bundle, ip);
1388		#if DEBUG
1389	<	printf("Bundle: %016lx%016lx\n", ip[1], ip[0]);
1389	>	printf("Bundle: %016llx%016llx\n", bundle[1], bundle[0]);
1390		#endif
1391
1392		switch (slot) {
1393		case 0:
1394	<	inst = (ip[0] >> 5) & 0x1fffffffffful;
1394	>	inst = (bundle[0] >> 5) & 0x1ffffffffffull;
1395		break;
1396		case 1:
1397	<	inst = ((ip[1] & 0x7ffffful) << 18) \| ((ip[0] >> 46) & 0x3fffful);
1397	>	inst = ((bundle[1] & 0x7fffffull) << 18) \| ((bundle[0] >> 46) & 0x3ffffull);
1398		break;
1399		case 2:
1400	<	inst = (ip[1] >> 23) & 0x1fffffffffful;
1400	>	inst = (bundle[1] >> 23) & 0x1ffffffffffull;
1401		break;
1402		case 3:
1403		fprintf(stderr, "ERROR: ia64_get_instruction(), invalid slot number %d\n", slot);
#	Line 1333 \| Line 1406 \| static unsigned long ia64_get_instructio
1406		}
1407
1408		#if DEBUG
1409	<	printf(" Instruction %d: 0x%016lx\n", slot, inst);
1409	>	printf(" Instruction %d: 0x%016llx\n", slot, inst);
1410		#endif
1411		return inst;
1412		}
#	Line 1617 \| Line 1690 \| static bool ia64_emulate_instruction(ia6
1690		if (inst->pred && !IA64_GET_PR(inst->pred))
1691		return true;
1692
1693	<	unsigned char nat, nat2;
1694	<	unsigned long dst, dst2, src1, src2, src3;
1693	>	uint8_t nat, nat2;
1694	>	uint64_t dst, dst2, src1, src2, src3;
1695
1696		switch (inst->mnemo) {
1697		case IA64_INST_NOP:
#	Line 1655 \| Line 1728 \| static bool ia64_emulate_instruction(ia6
1728		case IA64_INST_ZXT4:
1729		src1 = inst->operands[1].value;
1730		switch (inst->mnemo) {
1731	<	case IA64_INST_SXT1: dst = (signed long)(signed char)src1; break;
1732	<	case IA64_INST_SXT2: dst = (signed long)(signed short)src1; break;
1733	<	case IA64_INST_SXT4: dst = (signed long)(signed int)src1; break;
1734	<	case IA64_INST_ZXT1: dst = (unsigned char)src1; break;
1735	<	case IA64_INST_ZXT2: dst = (unsigned short)src1; break;
1736	<	case IA64_INST_ZXT4: dst = (unsigned int)src1; break;
1731	>	case IA64_INST_SXT1: dst = (int64_t)(int8_t)src1; break;
1732	>	case IA64_INST_SXT2: dst = (int64_t)(int16_t)src1; break;
1733	>	case IA64_INST_SXT4: dst = (int64_t)(int32_t)src1; break;
1734	>	case IA64_INST_ZXT1: dst = (uint8_t)src1; break;
1735	>	case IA64_INST_ZXT2: dst = (uint16_t)src1; break;
1736	>	case IA64_INST_ZXT4: dst = (uint32_t)src1; break;
1737		}
1738		inst->operands[0].commit = true;
1739		inst->operands[0].value = dst;
#	Line 1683 \| Line 1756 \| static bool ia64_emulate_instruction(ia6
1756		dst = 0;
1757		else {
1758		switch (inst->mnemo) {
1759	<	case IA64_INST_LD1: case IA64_INST_LD1_UPDATE: dst = ((unsigned char )src1); break;
1760	<	case IA64_INST_LD2: case IA64_INST_LD2_UPDATE: dst = ((unsigned short )src1); break;
1761	<	case IA64_INST_LD4: case IA64_INST_LD4_UPDATE: dst = ((unsigned int )src1); break;
1762	<	case IA64_INST_LD8: case IA64_INST_LD8_UPDATE: dst = ((unsigned long )src1); break;
1759	>	case IA64_INST_LD1: case IA64_INST_LD1_UPDATE: dst = ((uint8_t )src1); break;
1760	>	case IA64_INST_LD2: case IA64_INST_LD2_UPDATE: dst = ((uint16_t )src1); break;
1761	>	case IA64_INST_LD4: case IA64_INST_LD4_UPDATE: dst = ((uint32_t )src1); break;
1762	>	case IA64_INST_LD8: case IA64_INST_LD8_UPDATE: dst = ((uint64_t )src1); break;
1763		}
1764		}
1765		inst->operands[0].commit = true;
#	Line 1711 \| Line 1784 \| static bool ia64_emulate_instruction(ia6
1784		src1 = inst->operands[1].value;
1785		if (!inst->no_memory) {
1786		switch (inst->mnemo) {
1787	<	case IA64_INST_ST1: case IA64_INST_ST1_UPDATE: ((unsigned char )dst) = src1; break;
1788	<	case IA64_INST_ST2: case IA64_INST_ST2_UPDATE: ((unsigned short )dst) = src1; break;
1789	<	case IA64_INST_ST4: case IA64_INST_ST4_UPDATE: ((unsigned int )dst) = src1; break;
1790	<	case IA64_INST_ST8: case IA64_INST_ST8_UPDATE: ((unsigned long )dst) = src1; break;
1787	>	case IA64_INST_ST1: case IA64_INST_ST1_UPDATE: ((uint8_t )dst) = src1; break;
1788	>	case IA64_INST_ST2: case IA64_INST_ST2_UPDATE: ((uint16_t )dst) = src1; break;
1789	>	case IA64_INST_ST4: case IA64_INST_ST4_UPDATE: ((uint32_t )dst) = src1; break;
1790	>	case IA64_INST_ST8: case IA64_INST_ST8_UPDATE: ((uint64_t )dst) = src1; break;
1791		}
1792		}
1793		inst->operands[0].value = dst2;
#	Line 1730 \| Line 1803 \| static bool ia64_emulate_instruction(ia6
1803		continue;
1804		if (op.index == -1)
1805		return false; // XXX: internal error
1806	<	IA64_SET_GR(op.index, op.value);
1734	<	IA64_SET_NAT(op.index, op.nat);
1806	>	IA64_SET_GR(op.index, op.value, op.nat);
1807		}
1808		return true;
1809		}
1810
1811	<	static bool ia64_emulate_instruction(unsigned long raw_inst, IA64_CONTEXT_TYPE IA64_CONTEXT)
1811	>	static bool ia64_emulate_instruction(uint64_t raw_inst, IA64_CONTEXT_TYPE IA64_CONTEXT)
1812		{
1813		ia64_instruction_t inst;
1814		memset(&inst, 0, sizeof(inst));
#	Line 1748 \| Line 1820 \| static bool ia64_emulate_instruction(uns
1820
1821		static bool ia64_skip_instruction(IA64_CONTEXT_TYPE IA64_CONTEXT)
1822		{
1823	<	unsigned long ip = IA64_GET_IP();
1823	>	uint64_t ip = IA64_GET_IP();
1824		#if DEBUG
1825	<	printf("IP: 0x%016lx\n", ip);
1825	>	printf("IP: 0x%016llx\n", ip);
1826		#if 0
1827		printf(" Template 0x%02x\n", ia64_get_template(ip));
1828		ia64_get_instruction(ip, 0);
#	Line 1868 \| Line 1940 \| static bool ia64_skip_instruction(IA64_C
1940
1941		#if IA64_CAN_PATCH_IP_SLOT
1942		if ((slot = ip & 3) < 2)
1943	<	IA64_SET_IP((ip & ~3ul) + (slot + 1));
1943	>	IA64_SET_IP((ip & ~3ull) + (slot + 1));
1944		else
1945		#endif
1946	<	IA64_SET_IP((ip & ~3ul) + 16);
1946	>	IA64_SET_IP((ip & ~3ull) + 16);
1947		#if DEBUG
1948	<	printf("IP: 0x%016lx\n", IA64_GET_IP());
1948	>	printf("IP: 0x%016llx\n", IA64_GET_IP());
1949		#endif
1950		return true;
1951		}
#	Line 2976 \| Line 3048 \| void sigsegv_set_dump_state(sigsegv_stat
3048		const int REF_INDEX = 123;
3049		const int REF_VALUE = 45;
3050
3051	<	static int page_size;
3051	>	static sigsegv_uintptr_t page_size;
3052		static volatile char * page = 0;
3053		static volatile int handler_called = 0;
3054
#	Line 3014 \| Line 3086 \| static sigsegv_return_t sigsegv_test_han
3086		(instruction_address >= (sigsegv_address_t)e_region)))
3087		exit(11);
3088		#endif
3089	<	if (vm_protect((char *)((unsigned long)fault_address & -page_size), page_size, VM_PAGE_READ \| VM_PAGE_WRITE) != 0)
3089	>	if (vm_protect((char *)((sigsegv_uintptr_t)fault_address & -page_size), page_size, VM_PAGE_READ \| VM_PAGE_WRITE) != 0)
3090		exit(12);
3091		return SIGSEGV_RETURN_SUCCESS;
3092		}
#	Line 3027 \| Line 3099 \| static sigsegv_return_t sigsegv_insn_han
3099		#if DEBUG
3100		printf("sigsegv_insn_handler(%p, %p)\n", fault_address, instruction_address);
3101		#endif
3102	<	if (((unsigned long)fault_address - (unsigned long)page) < page_size) {
3102	>	if (((sigsegv_uintptr_t)fault_address - (sigsegv_uintptr_t)page) < page_size) {
3103		#ifdef __GNUC__
3104		// Make sure reported fault instruction address falls into
3105		// expected code range
#	Line 3045 \| Line 3117 \| static sigsegv_return_t sigsegv_insn_han
3117		// More sophisticated tests for instruction skipper
3118		static bool arch_insn_skipper_tests()
3119		{
3120	<	#if (defined(i386) \|\| defined(__i386__)) \|\| defined(__x86_64__)
3120	>	#if (defined(i386) \|\| defined(__i386__)) \|\| (defined(__x86_64__) \|\| defined(_M_X64))
3121		static const unsigned char code[] = {
3122		0x8a, 0x00, // mov (%eax),%al
3123		0x8a, 0x2c, 0x18, // mov (%eax,%ebx,1),%ch
#	Line 3059 \| Line 3131 \| static bool arch_insn_skipper_tests()
3131		0x8b, 0x0c, 0x18, // mov (%eax,%ebx,1),%ecx
3132		0x89, 0x00, // mov %eax,(%eax)
3133		0x89, 0x0c, 0x18, // mov %ecx,(%eax,%ebx,1)
3134	<	#if defined(__x86_64__)
3134	>	#if defined(__x86_64__) \|\| defined(_M_X64)
3135		0x44, 0x8a, 0x00, // mov (%rax),%r8b
3136		0x44, 0x8a, 0x20, // mov (%rax),%r12b
3137		0x42, 0x8a, 0x3c, 0x10, // mov (%rax,%r10,1),%dil
#	Line 3088 \| Line 3160 \| static bool arch_insn_skipper_tests()
3160		0 // end
3161		};
3162		const int N_REGS = 20;
3163	<	unsigned long regs[N_REGS];
3163	>	SIGSEGV_REGISTER_TYPE regs[N_REGS];
3164		for (int i = 0; i < N_REGS; i++)
3165		regs[i] = i;
3166	<	const unsigned long start_code = (unsigned long)&code;
3166	>	const sigsegv_uintptr_t start_code = (sigsegv_uintptr_t)&code;
3167		regs[X86_REG_EIP] = start_code;
3168		while ((regs[X86_REG_EIP] - start_code) < (sizeof(code) - 1)
3169		&& ix86_skip_instruction(regs))

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing BasiliskII/src/Unix/sigsegv.cpp (file contents): Revision 1.78 by gbeauche, 2008-01-07T22:44:39Z vs. Revision 1.81 by gbeauche, 2008-01-19T22:25:27Z

Diff Legend

Comparing BasiliskII/src/Unix/sigsegv.cpp (file contents):
Revision 1.78 by gbeauche, 2008-01-07T22:44:39Z vs.
Revision 1.81 by gbeauche, 2008-01-19T22:25:27Z