ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp

Comparing SheepShaver/src/kpx_cpu/sheepshaver_glue.cpp (file contents):
Revision 1.52 by gbeauche, 2004-11-13T14:09:16Z vs.
Revision 1.72 by gbeauche, 2007-01-17T06:20:36Z

#	Line 1 | Line 1
1		/*
2		*  sheepshaver_glue.cpp - Glue Kheperix CPU to SheepShaver CPU engine interface
3		*
4	<	*  SheepShaver (C) 1997-2004 Christian Bauer and Marc Hellwig
4	>	*  SheepShaver (C) 1997-2005 Christian Bauer and Marc Hellwig
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 42 | Line 42
42
43		#include <stdio.h>
44		#include <stdlib.h>
45	+	#ifdef HAVE_MALLOC_H
46	+	#include <malloc.h>
47	+	#endif
48
49		#ifdef USE_SDL_VIDEO
50		#include <SDL_events.h>
#	Line 86 | Line 89 | extern uintptr SignalStackBase();
89
90		// From rsrc_patches.cpp
91		extern "C" void check_load_invoc(uint32 type, int16 id, uint32 h);
92	+	extern "C" void named_check_load_invoc(uint32 type, uint32 name, uint32 h);
93
94		// PowerPC EmulOp to exit from emulation looop
95		const uint32 POWERPC_EXEC_RETURN = POWERPC_EMUL_OP | 1;
96
93	–	// Enable interrupt routine safety checks?
94	–	#define SAFE_INTERRUPT_PPC 1
95	–
97		// Enable Execute68k() safety checks?
98		#define SAFE_EXEC_68K 1
99
#	Line 139 | Line 140 | class sheepshaver_cpu
140		void init_decoder();
141		void execute_sheep(uint32 opcode);
142
142	–	// CPU context to preserve on interrupt
143	–	class interrupt_context {
144	–	uint32 gpr[32];
145	–	uint32 pc;
146	–	uint32 lr;
147	–	uint32 ctr;
148	–	uint32 cr;
149	–	uint32 xer;
150	–	sheepshaver_cpu *cpu;
151	–	const char *where;
152	–	public:
153	–	interrupt_context(sheepshaver_cpu *_cpu, const char *_where);
154	–	~interrupt_context();
155	–	};
156	–
143		public:
144
145		// Constructor
#	Line 180 | Line 166 | public:
166		// Execute MacOS/PPC code
167		uint32 execute_macos_code(uint32 tvect, int nargs, uint32 const *args);
168
169	+	#if PPC_ENABLE_JIT
170		// Compile one instruction
171		virtual int compile1(codegen_context_t & cg_context);
172	<
172	>	#endif
173		// Resource manager thunk
174		void get_resource(uint32 old_get_resource);
175
176		// Handle MacOS interrupt
177		void interrupt(uint32 entry);
191	–	void handle_interrupt();
178
179		// Make sure the SIGSEGV handler can access CPU registers
180		friend sigsegv_return_t sigsegv_handler(sigsegv_address_t, sigsegv_address_t);
181		};
182
197	–	// Memory allocator returning areas aligned on 16-byte boundaries
198	–	void *operator new(size_t size)
199	–	{
200	–	void *p;
201	–
202	–	#if defined(HAVE_POSIX_MEMALIGN)
203	–	if (posix_memalign(&p, 16, size) != 0)
204	–	throw std::bad_alloc();
205	–	#elif defined(HAVE_MEMALIGN)
206	–	p = memalign(16, size);
207	–	#elif defined(HAVE_VALLOC)
208	–	p = valloc(size); // page-aligned!
209	–	#else
210	–	/* XXX: handle padding ourselves */
211	–	p = malloc(size);
212	–	#endif
213	–
214	–	return p;
215	–	}
216	–
217	–	void operator delete(void *p)
218	–	{
219	–	#if defined(HAVE_MEMALIGN) || defined(HAVE_VALLOC)
220	–	#if defined(__GLIBC__)
221	–	// this is known to work only with GNU libc
222	–	free(p);
223	–	#endif
224	–	#else
225	–	free(p);
226	–	#endif
227	–	}
228	–
183		sheepshaver_cpu::sheepshaver_cpu()
184		: powerpc_cpu(enable_jit_p())
185		{
#	Line 237 | Line 191 | void sheepshaver_cpu::init_decoder()
191		static const instr_info_t sheep_ii_table[] = {
192		{ "sheep",
193		(execute_pmf)&sheepshaver_cpu::execute_sheep,
240	–	NULL,
194		PPC_I(SHEEP),
195		D_form, 6, 0, CFLOW_JUMP | CFLOW_TRAP
196		}
#	Line 274 | Line 227 | void sheepshaver_cpu::execute_emul_op(ui
227		for (int i = 0; i < 7; i++)
228		r68.a[i] = gpr(16 + i);
229		r68.a[7] = gpr(1);
230	<	uint32 saved_cr = get_cr() & CR_field<2>::mask();
230	>	uint32 saved_cr = get_cr() & 0xff9fffff; // mask_operand::compute(11, 8)
231		uint32 saved_xer = get_xer();
232		EmulOp(&r68, gpr(24), emul_op);
233		set_cr(saved_cr);
#	Line 318 | Line 271 | void sheepshaver_cpu::execute_sheep(uint
271		}
272
273		// Compile one instruction
274	+	#if PPC_ENABLE_JIT
275		int sheepshaver_cpu::compile1(codegen_context_t & cg_context)
276		{
323	–	#if PPC_ENABLE_JIT
277		const instr_info_t *ii = cg_context.instr_info;
278		if (ii->mnemo != PPC_I(SHEEP))
279		return COMPILE_FAILURE;
#	Line 382 | Line 335 | int sheepshaver_cpu::compile1(codegen_co
335		status = COMPILE_CODE_OK;
336		break;
337		}
338	+	#endif
339		case NATIVE_CHECK_LOAD_INVOC:
340		dg.gen_load_T0_GPR(3);
341		dg.gen_load_T1_GPR(4);
#	Line 390 | Line 344 | int sheepshaver_cpu::compile1(codegen_co
344		dg.gen_invoke_T0_T1_T2((void (*)(uint32, uint32, uint32))check_load_invoc);
345		status = COMPILE_CODE_OK;
346		break;
347	<	#endif
348	<	case NATIVE_BITBLT:
347	>	case NATIVE_NAMED_CHECK_LOAD_INVOC:
348	>	dg.gen_load_T0_GPR(3);
349	>	dg.gen_load_T1_GPR(4);
350	>	dg.gen_load_T2_GPR(5);
351	>	dg.gen_invoke_T0_T1_T2((void (*)(uint32, uint32, uint32))named_check_load_invoc);
352	>	status = COMPILE_CODE_OK;
353	>	break;
354	>	case NATIVE_NQD_SYNC_HOOK:
355	>	dg.gen_load_T0_GPR(3);
356	>	dg.gen_invoke_T0_ret_T0((uint32 (*)(uint32))NQD_sync_hook);
357	>	dg.gen_store_T0_GPR(3);
358	>	status = COMPILE_CODE_OK;
359	>	break;
360	>	case NATIVE_NQD_BITBLT_HOOK:
361	>	dg.gen_load_T0_GPR(3);
362	>	dg.gen_invoke_T0_ret_T0((uint32 (*)(uint32))NQD_bitblt_hook);
363	>	dg.gen_store_T0_GPR(3);
364	>	status = COMPILE_CODE_OK;
365	>	break;
366	>	case NATIVE_NQD_FILLRECT_HOOK:
367	>	dg.gen_load_T0_GPR(3);
368	>	dg.gen_invoke_T0_ret_T0((uint32 (*)(uint32))NQD_fillrect_hook);
369	>	dg.gen_store_T0_GPR(3);
370	>	status = COMPILE_CODE_OK;
371	>	break;
372	>	case NATIVE_NQD_UNKNOWN_HOOK:
373	>	dg.gen_load_T0_GPR(3);
374	>	dg.gen_invoke_T0_ret_T0((uint32 (*)(uint32))NQD_unknown_hook);
375	>	dg.gen_store_T0_GPR(3);
376	>	status = COMPILE_CODE_OK;
377	>	break;
378	>	case NATIVE_NQD_BITBLT:
379		dg.gen_load_T0_GPR(3);
380		dg.gen_invoke_T0((void (*)(uint32))NQD_bitblt);
381		status = COMPILE_CODE_OK;
382		break;
383	<	case NATIVE_INVRECT:
383	>	case NATIVE_NQD_INVRECT:
384		dg.gen_load_T0_GPR(3);
385		dg.gen_invoke_T0((void (*)(uint32))NQD_invrect);
386		status = COMPILE_CODE_OK;
387		break;
388	<	case NATIVE_FILLRECT:
388	>	case NATIVE_NQD_FILLRECT:
389		dg.gen_load_T0_GPR(3);
390		dg.gen_invoke_T0((void (*)(uint32))NQD_fillrect);
391		status = COMPILE_CODE_OK;
#	Line 412 | Line 396 | int sheepshaver_cpu::compile1(codegen_co
396		if (!FN_field::test(opcode))
397		cg_context.done_compile = false;
398		else {
399	<	dg.gen_load_A0_LR();
400	<	dg.gen_set_PC_A0();
399	>	dg.gen_load_T0_LR_aligned();
400	>	dg.gen_set_PC_T0();
401		cg_context.done_compile = true;
402		}
403		break;
#	Line 423 | Line 407 | int sheepshaver_cpu::compile1(codegen_co
407		if (!FN_field::test(opcode))
408		dg.gen_set_PC_im(cg_context.pc + 4);
409		else {
410	<	dg.gen_load_A0_LR();
411	<	dg.gen_set_PC_A0();
410	>	dg.gen_load_T0_LR_aligned();
411	>	dg.gen_set_PC_T0();
412		}
413		dg.gen_mov_32_T0_im(selector);
414		dg.gen_jmp(native_op_trampoline);
#	Line 466 | Line 450 | int sheepshaver_cpu::compile1(codegen_co
450		}
451		}
452		return status;
469	–	#endif
470	–	return COMPILE_FAILURE;
471	–	}
472	–
473	–	// CPU context to preserve on interrupt
474	–	sheepshaver_cpu::interrupt_context::interrupt_context(sheepshaver_cpu *_cpu, const char *_where)
475	–	{
476	–	#if SAFE_INTERRUPT_PPC >= 2
477	–	cpu = _cpu;
478	–	where = _where;
479	–
480	–	// Save interrupt context
481	–	memcpy(&gpr[0], &cpu->gpr(0), sizeof(gpr));
482	–	pc = cpu->pc();
483	–	lr = cpu->lr();
484	–	ctr = cpu->ctr();
485	–	cr = cpu->get_cr();
486	–	xer = cpu->get_xer();
487	–	#endif
453		}
489	–
490	–	sheepshaver_cpu::interrupt_context::~interrupt_context()
491	–	{
492	–	#if SAFE_INTERRUPT_PPC >= 2
493	–	// Check whether CPU context was preserved by interrupt
494	–	if (memcmp(&gpr[0], &cpu->gpr(0), sizeof(gpr)) != 0) {
495	–	printf("FATAL: %s: interrupt clobbers registers\n", where);
496	–	for (int i = 0; i < 32; i++)
497	–	if (gpr[i] != cpu->gpr(i))
498	–	printf(" r%d: %08x -> %08x\n", i, gpr[i], cpu->gpr(i));
499	–	}
500	–	if (pc != cpu->pc())
501	–	printf("FATAL: %s: interrupt clobbers PC\n", where);
502	–	if (lr != cpu->lr())
503	–	printf("FATAL: %s: interrupt clobbers LR\n", where);
504	–	if (ctr != cpu->ctr())
505	–	printf("FATAL: %s: interrupt clobbers CTR\n", where);
506	–	if (cr != cpu->get_cr())
507	–	printf("FATAL: %s: interrupt clobbers CR\n", where);
508	–	if (xer != cpu->get_xer())
509	–	printf("FATAL: %s: interrupt clobbers XER\n", where);
454		#endif
511	–	}
455
456		// Handle MacOS interrupt
457		void sheepshaver_cpu::interrupt(uint32 entry)
#	Line 518 | Line 461 | void sheepshaver_cpu::interrupt(uint32 e
461		const clock_t interrupt_start = clock();
462		#endif
463
521	–	#if SAFE_INTERRUPT_PPC
522	–	static int depth = 0;
523	–	if (depth != 0)
524	–	printf("FATAL: sheepshaver_cpu::interrupt() called more than once: %d\n", depth);
525	–	depth++;
526	–	#endif
527	–
464		// Save program counters and branch registers
465		uint32 saved_pc = pc();
466		uint32 saved_lr = lr();
#	Line 578 | Line 514 | void sheepshaver_cpu::interrupt(uint32 e
514		#if EMUL_TIME_STATS
515		interrupt_time += (clock() - interrupt_start);
516		#endif
581	–
582	–	#if SAFE_INTERRUPT_PPC
583	–	depth--;
584	–	#endif
517		}
518
519		// Execute 68k routine
#	Line 859 | Line 791 | sigsegv_return_t sigsegv_handler(sigsegv
791		#error "FIXME: You don't have the capability to skip instruction within signal handlers"
792		#endif
793
794	<	printf("SIGSEGV\n");
795	<	printf("  pc %p\n", fault_instruction);
796	<	printf("  ea %p\n", fault_address);
794	>	fprintf(stderr, "SIGSEGV\n");
795	>	fprintf(stderr, "  pc %p\n", fault_instruction);
796	>	fprintf(stderr, "  ea %p\n", fault_address);
797		dump_registers();
798		ppc_cpu->dump_log();
799		enter_mon();
#	Line 925 | Line 857 | void exit_emul_ppc(void)
857		#endif
858
859		delete ppc_cpu;
860	+	ppc_cpu = NULL;
861		}
862
863		#if PPC_ENABLE_JIT && PPC_REENTRANT_JIT
#	Line 972 | Line 905 | void emul_ppc(uint32 entry)
905
906		void TriggerInterrupt(void)
907		{
908	+	idle_resume();
909		#if 0
910		WriteMacInt32(0x16a, ReadMacInt32(0x16a) + 1);
911		#else
#	Line 981 | Line 915 | void TriggerInterrupt(void)
915		#endif
916		}
917
918	<	void sheepshaver_cpu::handle_interrupt(void)
918	>	void HandleInterrupt(powerpc_registers *r)
919		{
920		#ifdef USE_SDL_VIDEO
921		// We must fill in the events queue in the same thread that did call SDL_SetVideoMode()
#	Line 992 | Line 926 | void sheepshaver_cpu::handle_interrupt(v
926		if (int32(ReadMacInt32(XLM_IRQ_NEST)) > 0)
927		return;
928
929	<	// Current interrupt nest level
996	<	static int interrupt_depth = 0;
997	<	++interrupt_depth;
929	>	// Update interrupt count
930		#if EMUL_TIME_STATS
931		interrupt_count++;
932		#endif
933
1002	–	// Disable MacOS stack sniffer
1003	–	WriteMacInt32(0x110, 0);
1004	–
934		// Interrupt action depends on current run mode
935		switch (ReadMacInt32(XLM_RUN_MODE)) {
936		case MODE_68K:
937		// 68k emulator active, trigger 68k interrupt level 1
938		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
939	<	set_cr(get_cr() | tswap32(kernel_data->v[0x674 >> 2]));
939	>	r->cr.set(r->cr.get() | tswap32(kernel_data->v[0x674 >> 2]));
940		break;
941
942		#if INTERRUPTS_IN_NATIVE_MODE
943		case MODE_NATIVE:
944		// 68k emulator inactive, in nanokernel?
945	<	if (gpr(1) != KernelDataAddr && interrupt_depth == 1) {
1017	<	interrupt_context ctx(this, "PowerPC mode");
945	>	if (r->gpr[1] != KernelDataAddr) {
946
947		// Prepare for 68k interrupt level 1
948		WriteMacInt16(tswap32(kernel_data->v[0x67c >> 2]), 1);
#	Line 1036 | Line 964 | void sheepshaver_cpu::handle_interrupt(v
964		case MODE_EMUL_OP:
965		// 68k emulator active, within EMUL_OP routine, execute 68k interrupt routine directly when interrupt level is 0
966		if ((ReadMacInt32(XLM_68K_R25) & 7) == 0) {
1039	–	interrupt_context ctx(this, "68k mode");
967		#if EMUL_TIME_STATS
968		const clock_t interrupt_start = clock();
969		#endif
#	Line 1045 | Line 972 | void sheepshaver_cpu::handle_interrupt(v
972		M68kRegisters r;
973		uint32 old_r25 = ReadMacInt32(XLM_68K_R25);     // Save interrupt level
974		WriteMacInt32(XLM_68K_R25, 0x21);                       // Execute with interrupt level 1
975	<	static const uint8 proc[] = {
975	>	static const uint8 proc_template[] = {
976		0x3f, 0x3c, 0x00, 0x00,                 // move.w       #$0000,-(sp)    (fake format word)
977		0x48, 0x7a, 0x00, 0x0a,                 // pea          @1(pc)                  (return address)
978		0x40, 0xe7,                                             // move         sr,-(sp)                (saved SR)
#	Line 1053 | Line 980 | void sheepshaver_cpu::handle_interrupt(v
980		0x4e, 0xd0,                                             // jmp          (a0)
981		M68K_RTS >> 8, M68K_RTS & 0xff  // @1
982		};
983	<	Execute68k(Host2MacAddr((uint8 *)proc), &r);
983	>	BUILD_SHEEPSHAVER_PROCEDURE(proc);
984	>	Execute68k(proc, &r);
985		WriteMacInt32(XLM_68K_R25, old_r25);            // Restore interrupt level
986		#else
987		// Only update cursor
#	Line 1072 | Line 1000 | void sheepshaver_cpu::handle_interrupt(v
1000		break;
1001		#endif
1002		}
1075	–
1076	–	// We are done with this interrupt
1077	–	--interrupt_depth;
1003		}
1004
1080	–	static void get_resource(void);
1081	–	static void get_1_resource(void);
1082	–	static void get_ind_resource(void);
1083	–	static void get_1_ind_resource(void);
1084	–	static void r_get_resource(void);
1085	–
1005		// Execute NATIVE_OP routine
1006		void sheepshaver_cpu::execute_native_op(uint32 selector)
1007		{
#	Line 1104 | Line 1023 | void sheepshaver_cpu::execute_native_op(
1023		case NATIVE_VIDEO_DO_DRIVER_IO:
1024		gpr(3) = (int32)(int16)VideoDoDriverIO(gpr(3), gpr(4), gpr(5), gpr(6), gpr(7));
1025		break;
1026	<	#ifdef WORDS_BIGENDIAN
1026	>	case NATIVE_ETHER_AO_GET_HWADDR:
1027	>	AO_get_ethernet_address(gpr(3));
1028	>	break;
1029	>	case NATIVE_ETHER_AO_ADD_MULTI:
1030	>	AO_enable_multicast(gpr(3));
1031	>	break;
1032	>	case NATIVE_ETHER_AO_DEL_MULTI:
1033	>	AO_disable_multicast(gpr(3));
1034	>	break;
1035	>	case NATIVE_ETHER_AO_SEND_PACKET:
1036	>	AO_transmit_packet(gpr(3));
1037	>	break;
1038		case NATIVE_ETHER_IRQ:
1039		EtherIRQ();
1040		break;
#	Line 1126 | Line 1056 | void sheepshaver_cpu::execute_native_op(
1056		case NATIVE_ETHER_RSRV:
1057		gpr(3) = ether_rsrv((queue_t *)gpr(3));
1058		break;
1059	<	#else
1130	<	case NATIVE_ETHER_INIT:
1131	<	// FIXME: needs more complicated thunks
1132	<	gpr(3) = false;
1133	<	break;
1134	<	#endif
1135	<	case NATIVE_SYNC_HOOK:
1059	>	case NATIVE_NQD_SYNC_HOOK:
1060		gpr(3) = NQD_sync_hook(gpr(3));
1061		break;
1062	<	case NATIVE_BITBLT_HOOK:
1062	>	case NATIVE_NQD_UNKNOWN_HOOK:
1063	>	gpr(3) = NQD_unknown_hook(gpr(3));
1064	>	break;
1065	>	case NATIVE_NQD_BITBLT_HOOK:
1066		gpr(3) = NQD_bitblt_hook(gpr(3));
1067		break;
1068	<	case NATIVE_BITBLT:
1068	>	case NATIVE_NQD_BITBLT:
1069		NQD_bitblt(gpr(3));
1070		break;
1071	<	case NATIVE_FILLRECT_HOOK:
1071	>	case NATIVE_NQD_FILLRECT_HOOK:
1072		gpr(3) = NQD_fillrect_hook(gpr(3));
1073		break;
1074	<	case NATIVE_INVRECT:
1074	>	case NATIVE_NQD_INVRECT:
1075		NQD_invrect(gpr(3));
1076		break;
1077	<	case NATIVE_FILLRECT:
1077	>	case NATIVE_NQD_FILLRECT:
1078		NQD_fillrect(gpr(3));
1079		break;
1080		case NATIVE_SERIAL_NOTHING:
#	Line 1171 | Line 1098 | void sheepshaver_cpu::execute_native_op(
1098		break;
1099		}
1100		case NATIVE_GET_RESOURCE:
1101	+	get_resource(ReadMacInt32(XLM_GET_RESOURCE));
1102	+	break;
1103		case NATIVE_GET_1_RESOURCE:
1104	+	get_resource(ReadMacInt32(XLM_GET_1_RESOURCE));
1105	+	break;
1106		case NATIVE_GET_IND_RESOURCE:
1107	+	get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
1108	+	break;
1109		case NATIVE_GET_1_IND_RESOURCE:
1110	<	case NATIVE_R_GET_RESOURCE: {
1111	<	typedef void (*GetResourceCallback)(void);
1112	<	static const GetResourceCallback get_resource_callbacks[] = {
1113	<	::get_resource,
1181	<	::get_1_resource,
1182	<	::get_ind_resource,
1183	<	::get_1_ind_resource,
1184	<	::r_get_resource
1185	<	};
1186	<	get_resource_callbacks[selector - NATIVE_GET_RESOURCE]();
1110	>	get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
1111	>	break;
1112	>	case NATIVE_R_GET_RESOURCE:
1113	>	get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1114		break;
1188	–	}
1115		case NATIVE_MAKE_EXECUTABLE:
1116		MakeExecutable(0, gpr(4), gpr(5));
1117		break;
1118		case NATIVE_CHECK_LOAD_INVOC:
1119		check_load_invoc(gpr(3), gpr(4), gpr(5));
1120		break;
1121	+	case NATIVE_NAMED_CHECK_LOAD_INVOC:
1122	+	named_check_load_invoc(gpr(3), gpr(4), gpr(5));
1123	+	break;
1124		default:
1125		printf("FATAL: NATIVE_OP called with bogus selector %d\n", selector);
1126		QuitEmulator();
#	Line 1278 | Line 1207 | uint32 call_macos7(uint32 tvect, uint32
1207		const uint32 args[] = { arg1, arg2, arg3, arg4, arg5, arg6, arg7 };
1208		return ppc_cpu->execute_macos_code(tvect, sizeof(args)/sizeof(args[0]), args);
1209		}
1281	–
1282	–	/*
1283	–	*  Resource Manager thunks
1284	–	*/
1285	–
1286	–	void get_resource(void)
1287	–	{
1288	–	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_RESOURCE));
1289	–	}
1290	–
1291	–	void get_1_resource(void)
1292	–	{
1293	–	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_1_RESOURCE));
1294	–	}
1295	–
1296	–	void get_ind_resource(void)
1297	–	{
1298	–	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_IND_RESOURCE));
1299	–	}
1300	–
1301	–	void get_1_ind_resource(void)
1302	–	{
1303	–	ppc_cpu->get_resource(ReadMacInt32(XLM_GET_1_IND_RESOURCE));
1304	–	}
1305	–
1306	–	void r_get_resource(void)
1307	–	{
1308	–	ppc_cpu->get_resource(ReadMacInt32(XLM_R_GET_RESOURCE));
1309	–	}

Diff Legend

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