[ViewVC] Diff of: cebix/SheepShaver/src/macos

Comparing SheepShaver/src/macos_util.cpp (file contents):
Revision 1.7 by gbeauche, 2004-05-10T16:16:26Z vs.
Revision 1.10 by gbeauche, 2004-12-19T09:01:04Z

#	Line 42 \| Line 42 \| *static inline long CallUniversal(void a**
42		}
43		typedef int16 (gsl_ptr)(char , uint32, uint32, uint32 , void , char );
44		static uint32 gsl_tvect = 0;
45	<	static inline int16 GetSharedLibrary(char arg1, uint32 arg2, uint32 arg3, uint32 arg4, void *arg5, char arg6)
45	>	static inline int16 GetSharedLibrary(uintptr arg1, uint32 arg2, uint32 arg3, uintptr arg4, uintptr arg5, uintptr arg6)
46		{
47	<	return (int16)CallMacOS6(gsl_ptr, gsl_tvect, arg1, arg2, arg3, arg4, arg5, arg6);
47	>	return (int16)CallMacOS6(gsl_ptr, gsl_tvect, (char )arg1, arg2, arg3, (uint32 )arg4, (void *)arg5, (char )arg6);
48		}
49		typedef int16 (fs_ptr)(uint32, char , void *, uint32 );
50		static uint32 fs_tvect = 0;
51	<	static inline int16 FindSymbol(uint32 arg1, char arg2, void arg3, uint32 arg4)
51	>	static inline int16 FindSymbol(uint32 arg1, uintptr arg2, uintptr arg3, uintptr arg4)
52		{
53	<	return (int16)CallMacOS4(fs_ptr, fs_tvect, arg1, arg2, arg3, arg4);
53	>	return (int16)CallMacOS4(fs_ptr, fs_tvect, arg1, (char )arg2, (void )arg3, (uint32 *)arg4);
54		}
55		typedef int16 (cc_ptr)(uint32 );
56		static uint32 cc_tvect = 0;
#	Line 58 \| Line 58 \| static inline int16 CloseConnection(uint
58		{
59		return (int16)CallMacOS1(cc_ptr, cc_tvect, arg1);
60		}
61	<	typedef void (nps_ptr)(uint32);
61	>	typedef uint32 (*nps_ptr)(uint32);
62		static uint32 nps_tvect = 0;
63	<	static inline void *NewPtrSys(uint32 arg1)
63	>	static inline uint32 NewPtrSys(uint32 arg1)
64		{
65	<	return (void *)CallMacOS1(nps_ptr, nps_tvect, arg1);
65	>	return CallMacOS1(nps_ptr, nps_tvect, arg1);
66		}
67	<	typedef void (d_ptr)(void );
67	>	typedef void (*d_ptr)(uint32);
68		static uint32 d_tvect = 0;
69	<	static inline void DisposePtr(void *arg1)
69	>	static inline void DisposePtr(uint32 arg1)
70		{
71		CallMacOS1(d_ptr, d_tvect, arg1);
72		}
#	Line 163 \| Line 163 \| void FileDiskLayout(loff_t size, uint8 *
163		* lib and sym must be Pascal strings!
164		*/
165
166	<	void FindLibSymbol(char lib_str, char *sym_str)
166	>	uint32 FindLibSymbol(char lib_str, char sym_str)
167		{
168		SheepVar32 conn_id = 0;
169		SheepVar32 main_addr = 0;
#	Line 181 \| Line 181 \| *void FindLibSymbol(char lib_str, char*
181		M68kRegisters r;
182
183		// Find shared library
184	<	static const uint16 proc1[] = {
185	<	PW(0x558f), // subq.l #2,a7
186	<	PW(0x2f08), // move.l a0,-(a7)
187	<	PW(0x2f3c), PW(0x7077), PW(0x7063), // move.l #'pwpc',-(a7)
188	<	PW(0x2f3c), PW(0x0000), PW(0x0001), // move.l #kReferenceCFrag,-(a7)
189	<	PW(0x2f09), // move.l a1,-(a7)
190	<	PW(0x2f0a), // move.l a2,-(a7)
191	<	PW(0x2f0b), // move.l a3,-(a7)
192	<	PW(0x3f3c), PW(0x0001), // (GetSharedLibrary)
193	<	PW(0xaa5a), // CFMDispatch
194	<	PW(0x301f), // move.w (a7)+,d0
195	<	PW(M68K_RTS)
184	>	static const uint8 proc1_template[] = {
185	>	0x55, 0x8f, // subq.l #2,a7
186	>	0x2f, 0x08, // move.l a0,-(a7)
187	>	0x2f, 0x3c, 0x70, 0x77, 0x70, 0x63, // move.l #'pwpc',-(a7)
188	>	0x2f, 0x3c, 0x00, 0x00, 0x00, 0x01, // move.l #kReferenceCFrag,-(a7)
189	>	0x2f, 0x09, // move.l a1,-(a7)
190	>	0x2f, 0x0a, // move.l a2,-(a7)
191	>	0x2f, 0x0b, // move.l a3,-(a7)
192	>	0x3f, 0x3c, 0x00, 0x01, // (GetSharedLibrary)
193	>	0xaa, 0x5a, // CFMDispatch
194	>	0x30, 0x1f, // move.w (a7)+,d0
195	>	M68K_RTS >> 8, M68K_RTS
196		};
197	+	BUILD_SHEEPSHAVER_PROCEDURE(proc1);
198		r.a[0] = lib.addr();
199		r.a[1] = conn_id.addr();
200		r.a[2] = main_addr.addr();
201		r.a[3] = err.addr();
202	<	Execute68k((uint32)proc1, &r);
202	>	Execute68k(proc1, &r);
203		D(bug(" GetSharedLibrary: ret %d, connection ID %ld, main %p\n", (int16)r.d[0], conn_id.value(), main_addr.value()));
204		if (r.d[0])
205	<	return NULL;
205	>	return 0;
206
207		// Find symbol
208	<	static const uint16 proc2[] = {
209	<	PW(0x558f), // subq.l #2,a7
210	<	PW(0x2f00), // move.l d0,-(a7)
211	<	PW(0x2f08), // move.l a0,-(a7)
212	<	PW(0x2f09), // move.l a1,-(a7)
213	<	PW(0x2f0a), // move.l a2,-(a7)
214	<	PW(0x3f3c), PW(0x0005), // (FindSymbol)
215	<	PW(0xaa5a), // CFMDispatch
216	<	PW(0x301f), // move.w (a7)+,d0
217	<	PW(M68K_RTS)
208	>	static const uint8 proc2_template[] = {
209	>	0x55, 0x8f, // subq.l #2,a7
210	>	0x2f, 0x00, // move.l d0,-(a7)
211	>	0x2f, 0x08, // move.l a0,-(a7)
212	>	0x2f, 0x09, // move.l a1,-(a7)
213	>	0x2f, 0x0a, // move.l a2,-(a7)
214	>	0x3f, 0x3c, 0x00, 0x05, // (FindSymbol)
215	>	0xaa, 0x5a, // CFMDispatch
216	>	0x30, 0x1f, // move.w (a7)+,d0
217	>	M68K_RTS >> 8, M68K_RTS
218		};
219	+	BUILD_SHEEPSHAVER_PROCEDURE(proc2);
220		r.d[0] = conn_id.value();
221		r.a[0] = sym.addr();
222		r.a[1] = sym_addr.addr();
223		r.a[2] = sym_class.addr();
224	<	Execute68k((uint32)proc2, &r);
224	>	Execute68k(proc2, &r);
225		D(bug(" FindSymbol1: ret %d, sym_addr %p, sym_class %ld\n", (int16)r.d[0], sym_addr.value(), sym_class.value()));
226		//!! CloseConnection()?
227		if (r.d[0])
228	<	return NULL;
228	>	return 0;
229		else
230	<	return (void *)sym_addr.value();
230	>	return sym_addr.value();
231
232		} else {
233
#	Line 234 \| Line 236 \| *void FindLibSymbol(char lib_str, char*
236		return 0;
237		}
238		int16 res;
239	<	res = GetSharedLibrary(lib.value(), FOURCC('p','w','p','c'), 1, (uint32 )conn_id.addr(), (void )main_addr.addr(), (char )err.addr());
239	>	res = GetSharedLibrary(lib.addr(), FOURCC('p','w','p','c'), 1, conn_id.addr(), main_addr.addr(), err.addr());
240		D(bug(" GetSharedLibrary: ret %d, connection ID %ld, main %p\n", res, conn_id.value(), main_addr.value()));
241		if (res)
242	<	return NULL;
243	<	res = FindSymbol(conn_id.value(), sym.value(), (void *)sym_addr.addr(), (uint32 )sym_class.addr());
242	>	return 0;
243	>	res = FindSymbol(conn_id.value(), sym.addr(), sym_addr.addr(), sym_class.addr());
244		D(bug(" FindSymbol: ret %d, sym_addr %p, sym_class %ld\n", res, sym_addr.value(), sym_class.value()));
245		//!!?? CloseConnection(&conn_id);
246		if (res)
247	<	return NULL;
247	>	return 0;
248		else
249	<	return (void *)sym_addr.value();
249	>	return sym_addr.value();
250		}
251		}
252
#	Line 255 \| Line 257 \| *void FindLibSymbol(char lib_str, char*
257
258		void InitCallUniversalProc()
259		{
260	<	cu_tvect = (uint32)FindLibSymbol("\014InterfaceLib", "\021CallUniversalProc");
260	>	cu_tvect = FindLibSymbol("\014InterfaceLib", "\021CallUniversalProc");
261		D(bug("CallUniversalProc TVECT at %08lx\n", cu_tvect));
262		if (cu_tvect == 0) {
263		printf("FATAL: Can't find CallUniversalProc()\n");
264		QuitEmulator();
265		}
266
267	<	gsl_tvect = (uint32)FindLibSymbol("\014InterfaceLib", "\020GetSharedLibrary");
267	>	gsl_tvect = FindLibSymbol("\014InterfaceLib", "\020GetSharedLibrary");
268		D(bug("GetSharedLibrary TVECT at %08lx\n", gsl_tvect));
269		if (gsl_tvect == 0) {
270		printf("FATAL: Can't find GetSharedLibrary()\n");
271		QuitEmulator();
272		}
273
274	<	fs_tvect = (uint32)FindLibSymbol("\014InterfaceLib", "\012FindSymbol");
274	>	fs_tvect = FindLibSymbol("\014InterfaceLib", "\012FindSymbol");
275		D(bug("FindSymbol TVECT at %08lx\n", fs_tvect));
276		if (fs_tvect == 0) {
277		printf("FATAL: Can't find FindSymbol()\n");
278		QuitEmulator();
279		}
280
281	<	cc_tvect = (uint32)FindLibSymbol("\014InterfaceLib", "\017CloseConnection");
281	>	cc_tvect = FindLibSymbol("\014InterfaceLib", "\017CloseConnection");
282		D(bug("CloseConnection TVECT at %08lx\n", cc_tvect));
283		if (cc_tvect == 0) {
284		printf("FATAL: Can't find CloseConnection()\n");
285		QuitEmulator();
286		}
287
288	<	nps_tvect = (uint32)FindLibSymbol("\014InterfaceLib", "\011NewPtrSys");
288	>	nps_tvect = FindLibSymbol("\014InterfaceLib", "\011NewPtrSys");
289		D(bug("NewPtrSys TVECT at %08lx\n", nps_tvect));
290		if (nps_tvect == 0) {
291		printf("FATAL: Can't find NewPtrSys()\n");
292		QuitEmulator();
293		}
294
295	<	d_tvect = (uint32)FindLibSymbol("\014InterfaceLib", "\012DisposePtr");
295	>	d_tvect = FindLibSymbol("\014InterfaceLib", "\012DisposePtr");
296		D(bug("DisposePtr TVECT at %08lx\n", d_tvect));
297		if (d_tvect == 0) {
298		printf("FATAL: Can't find DisposePtr()\n");
#	Line 341 \| Line 343 \| uint32 TimeToMacTime(time_t t)
343		* Memory allocators in MacOS system heap zone
344		*/
345
346	<	void *Mac_sysalloc(uint32 size)
346	>	uint32 Mac_sysalloc(uint32 size)
347		{
348		return NewPtrSys(size);
349		}
350
351	<	void Mac_sysfree(void *p)
351	>	void Mac_sysfree(uint32 addr)
352		{
353	<	DisposePtr(p);
353	>	DisposePtr(addr);
354		}

Diff Legend

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

Comparing SheepShaver/src/macos_util.cpp (file contents): Revision 1.7 by gbeauche, 2004-05-10T16:16:26Z vs. Revision 1.10 by gbeauche, 2004-12-19T09:01:04Z

Diff Legend

Comparing SheepShaver/src/macos_util.cpp (file contents):
Revision 1.7 by gbeauche, 2004-05-10T16:16:26Z vs.
Revision 1.10 by gbeauche, 2004-12-19T09:01:04Z