20120509-1317

forsyth committed 14 years ago

Commit 5b94d011 parent 037916511 files · +41 −24Browse files

Unified · Split

11 files

@@ -1,3 +1,5 @@
	1	+20120509
	2	+ utils/libmach: add missing user stack top initialisers, minor changes to sync with 9
1	3	20120507
2	4	mkfiles/mkfile-MacOSX-386 change cc to gcc
3	5	emu/MacOSX/win.c null out drawcursor

@@ -1 +1 @@
1		−#define VERSION "Fourth Edition (20120507)"
	1	+#define VERSION "Fourth Edition (20120509)"

@@ -16,7 +16,6 @@ · 15 unmodified lines
16	16
17	17	Reglist armreglist[] =
18	18	{
19		− {"LINK", REGOFF(link), RINT\|RRDONLY, 'X'},
20	19	{"TYPE", REGOFF(type), RINT\|RRDONLY, 'X'},
21	20	{"PSR", REGOFF(psr), RINT\|RRDONLY, 'X'},
22	21	{"PC", PC, RINT, 'X'},
@@ -50,12 +49,13 @@ Mach marm = · 27 unmodified lines
50	49	0, /* fp register set size */
51	50	"PC", /* name of PC */
52	51	"SP", /* name of SP */
53		− "R15", /* name of link register */
	52	+ "R14", /* name of link register */
54	53	"setR12", /* static base register name */
55	54	0, /* static base register value */
56	55	0x1000, /* page size */
57	56	0xC0000000, /* kernel base */
58		− 0, /* kernel text mask */
	57	+ 0xC0000000, /* kernel text mask */
	58	+ 0x3FFFFFFF, /* user stack top */
59	59	4, /* quantization of pc */
60	60	4, /* szaddr */
61	61	4, /* szreg */

@@ -60,7 +60,7 @@ static int arminstlen(Map*, uvlong); · 59 unmodified lines
60	60	*/
61	61	Machdata armmach =
62	62	{
63		− {0, 0, 0, 0xD}, /* break point */
	63	+ {0x70, 0x00, 0x20, 0xD1}, /* break point / / D1200070 */
64	64	4, /* break point size */
65	65
66	66	leswab, /* short to local byte order */

@@ -36,9 +36,12 @@ _read5(Biobuf bp, Prog p) · 35 unmodified lines
36	36	if(as < 0)
37	37	return 0;
38	38	p->kind = aNone;
	39	+ p->sig = 0;
39	40	if(as == ANAME \|\| as == ASIGNAME){
40		− if(as == ASIGNAME)
41		− skip(bp, 4); /* signature */
	41	+ if(as == ASIGNAME){
	42	+ Bread(bp, &p->sig, 4);
	43	+ p->sig = leswal(p->sig);
	44	+ }
42	45	p->kind = aName;
43	46	p->type = type2char(Bgetc(bp)); /* type */
44	47	p->sym = Bgetc(bp); /* sym */

@@ -15,7 +15,7 @@ · 14 unmodified lines
15	15	#define REGSIZE sizeof(struct Ureg)
16	16	#define FP_CTL(x) (REGSIZE+4*(x))
17	17	#define FP_REG(x) (FP_CTL(7)+10*(x))
18		−#define FPREGSIZE (64+810)
	18	+#define FPREGSIZE (74+810)
19	19
20	20	Reglist i386reglist[] = {
21	21	{"DI", REGOFF(di), RINT, 'X'},
@@ -44,14 +44,14 @@ Reglist i386reglist[] = { · 22 unmodified lines
44	44	{"E4", FP_CTL(4), RFLT, 'X'},
45	45	{"E5", FP_CTL(5), RFLT, 'X'},
46	46	{"E6", FP_CTL(6), RFLT, 'X'},
47		− {"F0", FP_REG(7), RFLT, '3'},
48		− {"F1", FP_REG(6), RFLT, '3'},
49		− {"F2", FP_REG(5), RFLT, '3'},
50		− {"F3", FP_REG(4), RFLT, '3'},
51		− {"F4", FP_REG(3), RFLT, '3'},
52		− {"F5", FP_REG(2), RFLT, '3'},
53		− {"F6", FP_REG(1), RFLT, '3'},
54		− {"F7", FP_REG(0), RFLT, '3'},
	47	+ {"F0", FP_REG(0), RFLT, '3'},
	48	+ {"F1", FP_REG(1), RFLT, '3'},
	49	+ {"F2", FP_REG(2), RFLT, '3'},
	50	+ {"F3", FP_REG(3), RFLT, '3'},
	51	+ {"F4", FP_REG(4), RFLT, '3'},
	52	+ {"F5", FP_REG(5), RFLT, '3'},
	53	+ {"F6", FP_REG(6), RFLT, '3'},
	54	+ {"F7", FP_REG(7), RFLT, '3'},
55	55	{ 0 }
56	56	};
57	57
@@ -69,7 +69,8 @@ Mach mi386 = · 11 unmodified lines
69	69	0, /* static base register value */
70	70	0x1000, /* page size */
71	71	0x80100000, /* kernel base */
72		− 0, /* kernel text mask */
	72	+ 0x80000000, /* kernel text mask */
	73	+ 0x7FFFFFFF, /* user stack top */
73	74	1, /* quantization of pc */
74	75	4, /* szaddr */
75	76	4, /* szreg */

@@ -42,9 +42,12 @@ _read8(Biobuf bp, Prog p) · 41 unmodified lines
42	42	return 0;
43	43	as \|= ((c & 0xff) << 8);
44	44	p->kind = aNone;
	45	+ p->sig = 0;
45	46	if(as == ANAME \|\| as == ASIGNAME){
46		− if(as == ASIGNAME)
47		− skip(bp, 4); /* signature */
	47	+ if(as == ASIGNAME){
	48	+ Bread(bp, &p->sig, 4);
	49	+ p->sig = leswal(p->sig);
	50	+ }
48	51	p->kind = aName;
49	52	p->type = type2char(Bgetc(bp)); /* type */
50	53	p->sym = Bgetc(bp); /* sym */

@@ -108,7 +108,8 @@ Mach msparc = · 107 unmodified lines
108	108	0, /* value */
109	109	0x1000, /* page size */
110	110	0xE0000000, /* kernel base */
111		− 0, /* kernel text mask */
	111	+ 0xE0000000, /* kernel text mask */
	112	+ 0x7FFFFFFF, /* user stack top */
112	113	4, /* quantization of pc */
113	114	4, /* szaddr */
114	115	4, /* szreg */

@@ -38,9 +38,12 @@ _readk(Biobuf bp, Prog p) · 37 unmodified lines
38	38	if(as < 0)
39	39	return 0;
40	40	p->kind = aNone;
	41	+ p->sig = 0;
41	42	if(as == ANAME \|\| as == ASIGNAME){
42		− if(as == ASIGNAME)
43		− skip(bp, 4); /* signature */
	43	+ if(as == ASIGNAME){
	44	+ Bread(bp, &p->sig, 4);
	45	+ p->sig = beswal(p->sig);
	46	+ }
44	47	p->kind = aName;
45	48	p->type = type2char(Bgetc(bp)); /* type */
46	49	p->sym = Bgetc(bp); /* sym */

@@ -36,9 +36,12 @@ _readv(Biobuf bp, Prog p) · 35 unmodified lines
36	36	if(as < 0)
37	37	return 0;
38	38	p->kind = aNone;
	39	+ p->sig = 0;
39	40	if(as == ANAME \|\| as == ASIGNAME){
40		− if(as == ASIGNAME)
41		− skip(bp, 4); /* signature */
	41	+ if(as == ASIGNAME){
	42	+ Bread(bp, &p->sig, 4);
	43	+ p->sig = beswal(p->sig);
	44	+ }
42	45	p->kind = aName;
43	46	p->type = type2char(Bgetc(bp)); /* type */
44	47	p->sym = Bgetc(bp); /* sym */