History

20120509-1317

forsyth committed 14 years ago

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

Unified · Split

11 files
  1. CHANGES +2 −0
  2. include/version.h +1 −1
  3. utils/libmach/5.c +3 −3
  4. utils/libmach/5db.c +1 −1
  5. utils/libmach/5obj.c +5 −2
  6. utils/libmach/8.c +11 −10
  7. utils/libmach/8obj.c +5 −2
  8. utils/libmach/k.c +2 −1
  9. utils/libmach/kobj.c +5 −2
  10. utils/libmach/v.c +1 −0
  11. utils/libmach/vobj.c +5 −2
CHANGES+2−0
@@ -1,3 +1,5 @@
120120509
2 utils/libmach: add missing user stack top initialisers, minor changes to sync with 9
120120507320120507
2 mkfiles/mkfile-MacOSX-386 change cc to gcc4 mkfiles/mkfile-MacOSX-386 change cc to gcc
3 emu/MacOSX/win.c null out drawcursor5 emu/MacOSX/win.c null out drawcursor
include/version.h+1−1
@@ -1 +1 @@
1#define VERSION "Fourth Edition (20120507)"1#define VERSION "Fourth Edition (20120509)"
utils/libmach/5.c+3−3
@@ -16,7 +16,6 @@ · 15 unmodified lines
16 16
17Reglist armreglist[] =17Reglist armreglist[] =
18{18{
19 {"LINK", REGOFF(link), RINT|RRDONLY, 'X'},
20 {"TYPE", REGOFF(type), RINT|RRDONLY, 'X'},19 {"TYPE", REGOFF(type), RINT|RRDONLY, 'X'},
21 {"PSR", REGOFF(psr), RINT|RRDONLY, 'X'},20 {"PSR", REGOFF(psr), RINT|RRDONLY, 'X'},
22 {"PC", PC, RINT, 'X'},21 {"PC", PC, RINT, 'X'},
@@ -50,12 +49,13 @@ Mach marm = · 27 unmodified lines
50 0, /* fp register set size */49 0, /* fp register set size */
51 "PC", /* name of PC */50 "PC", /* name of PC */
52 "SP", /* name of SP */51 "SP", /* name of SP */
53 "R15", /* name of link register */52 "R14", /* name of link register */
54 "setR12", /* static base register name */53 "setR12", /* static base register name */
55 0, /* static base register value */54 0, /* static base register value */
56 0x1000, /* page size */55 0x1000, /* page size */
57 0xC0000000, /* kernel base */56 0xC0000000, /* kernel base */
58 0, /* kernel text mask */57 0xC0000000, /* kernel text mask */
58 0x3FFFFFFF, /* user stack top */
59 4, /* quantization of pc */59 4, /* quantization of pc */
60 4, /* szaddr */60 4, /* szaddr */
61 4, /* szreg */61 4, /* szreg */
utils/libmach/5db.c+1−1
@@ -60,7 +60,7 @@ static int arminstlen(Map*, uvlong); · 59 unmodified lines
60 */60 */
61Machdata armmach =61Machdata armmach =
62{62{
63 {0, 0, 0, 0xD}, /* break point */63 {0x70, 0x00, 0x20, 0xD1}, /* break point */ /* D1200070 */
64 4, /* break point size */64 4, /* break point size */
65 65
66 leswab, /* short to local byte order */66 leswab, /* short to local byte order */
utils/libmach/5obj.c+5−2
@@ -36,9 +36,12 @@ _read5(Biobuf *bp, Prog *p) · 35 unmodified lines
36 if(as < 0)36 if(as < 0)
37 return 0;37 return 0;
38 p->kind = aNone;38 p->kind = aNone;
39 p->sig = 0;
39 if(as == ANAME || as == ASIGNAME){40 if(as == ANAME || as == ASIGNAME){
40 if(as == ASIGNAME)41 if(as == ASIGNAME){
41 skip(bp, 4); /* signature */42 Bread(bp, &p->sig, 4);
43 p->sig = leswal(p->sig);
44 }
42 p->kind = aName;45 p->kind = aName;
43 p->type = type2char(Bgetc(bp)); /* type */46 p->type = type2char(Bgetc(bp)); /* type */
44 p->sym = Bgetc(bp); /* sym */47 p->sym = Bgetc(bp); /* sym */
utils/libmach/8.c+11−10
@@ -15,7 +15,7 @@ · 14 unmodified lines
15#define REGSIZE sizeof(struct Ureg)15#define REGSIZE sizeof(struct Ureg)
16#define FP_CTL(x) (REGSIZE+4*(x))16#define FP_CTL(x) (REGSIZE+4*(x))
17#define FP_REG(x) (FP_CTL(7)+10*(x))17#define FP_REG(x) (FP_CTL(7)+10*(x))
18#define FPREGSIZE (6*4+8*10)18#define FPREGSIZE (7*4+8*10)
19 19
20Reglist i386reglist[] = {20Reglist i386reglist[] = {
21 {"DI", REGOFF(di), RINT, 'X'},21 {"DI", REGOFF(di), RINT, 'X'},
@@ -44,14 +44,14 @@ Reglist i386reglist[] = { · 22 unmodified lines
44 {"E4", FP_CTL(4), RFLT, 'X'},44 {"E4", FP_CTL(4), RFLT, 'X'},
45 {"E5", FP_CTL(5), RFLT, 'X'},45 {"E5", FP_CTL(5), RFLT, 'X'},
46 {"E6", FP_CTL(6), RFLT, 'X'},46 {"E6", FP_CTL(6), RFLT, 'X'},
47 {"F0", FP_REG(7), RFLT, '3'},47 {"F0", FP_REG(0), RFLT, '3'},
48 {"F1", FP_REG(6), RFLT, '3'},48 {"F1", FP_REG(1), RFLT, '3'},
49 {"F2", FP_REG(5), RFLT, '3'},49 {"F2", FP_REG(2), RFLT, '3'},
50 {"F3", FP_REG(4), RFLT, '3'},50 {"F3", FP_REG(3), RFLT, '3'},
51 {"F4", FP_REG(3), RFLT, '3'},51 {"F4", FP_REG(4), RFLT, '3'},
52 {"F5", FP_REG(2), RFLT, '3'},52 {"F5", FP_REG(5), RFLT, '3'},
53 {"F6", FP_REG(1), RFLT, '3'},53 {"F6", FP_REG(6), RFLT, '3'},
54 {"F7", FP_REG(0), RFLT, '3'},54 {"F7", FP_REG(7), RFLT, '3'},
55 { 0 }55 { 0 }
56};56};
57 57
@@ -69,7 +69,8 @@ Mach mi386 = · 11 unmodified lines
69 0, /* static base register value */69 0, /* static base register value */
70 0x1000, /* page size */70 0x1000, /* page size */
71 0x80100000, /* kernel base */71 0x80100000, /* kernel base */
72 0, /* kernel text mask */72 0x80000000, /* kernel text mask */
73 0x7FFFFFFF, /* user stack top */
73 1, /* quantization of pc */74 1, /* quantization of pc */
74 4, /* szaddr */75 4, /* szaddr */
75 4, /* szreg */76 4, /* szreg */
utils/libmach/8obj.c+5−2
@@ -42,9 +42,12 @@ _read8(Biobuf *bp, Prog* p) · 41 unmodified lines
42 return 0;42 return 0;
43 as |= ((c & 0xff) << 8);43 as |= ((c & 0xff) << 8);
44 p->kind = aNone;44 p->kind = aNone;
45 p->sig = 0;
45 if(as == ANAME || as == ASIGNAME){46 if(as == ANAME || as == ASIGNAME){
46 if(as == ASIGNAME)47 if(as == ASIGNAME){
47 skip(bp, 4); /* signature */48 Bread(bp, &p->sig, 4);
49 p->sig = leswal(p->sig);
50 }
48 p->kind = aName;51 p->kind = aName;
49 p->type = type2char(Bgetc(bp)); /* type */52 p->type = type2char(Bgetc(bp)); /* type */
50 p->sym = Bgetc(bp); /* sym */53 p->sym = Bgetc(bp); /* sym */
utils/libmach/k.c+2−1
@@ -108,7 +108,8 @@ Mach msparc = · 107 unmodified lines
108 0, /* value */108 0, /* value */
109 0x1000, /* page size */109 0x1000, /* page size */
110 0xE0000000, /* kernel base */110 0xE0000000, /* kernel base */
111 0, /* kernel text mask */111 0xE0000000, /* kernel text mask */
112 0x7FFFFFFF, /* user stack top */
112 4, /* quantization of pc */113 4, /* quantization of pc */
113 4, /* szaddr */114 4, /* szaddr */
114 4, /* szreg */115 4, /* szreg */
utils/libmach/kobj.c+5−2
@@ -38,9 +38,12 @@ _readk(Biobuf *bp, Prog *p) · 37 unmodified lines
38 if(as < 0)38 if(as < 0)
39 return 0;39 return 0;
40 p->kind = aNone;40 p->kind = aNone;
41 p->sig = 0;
41 if(as == ANAME || as == ASIGNAME){42 if(as == ANAME || as == ASIGNAME){
42 if(as == ASIGNAME)43 if(as == ASIGNAME){
43 skip(bp, 4); /* signature */44 Bread(bp, &p->sig, 4);
45 p->sig = beswal(p->sig);
46 }
44 p->kind = aName;47 p->kind = aName;
45 p->type = type2char(Bgetc(bp)); /* type */48 p->type = type2char(Bgetc(bp)); /* type */
46 p->sym = Bgetc(bp); /* sym */49 p->sym = Bgetc(bp); /* sym */
utils/libmach/v.c+1−0
@@ -108,6 +108,7 @@ Mach mmips = · 107 unmodified lines
108 0x1000, /* page size */108 0x1000, /* page size */
109 0xC0000000, /* kernel base */109 0xC0000000, /* kernel base */
110 0x40000000, /* kernel text mask */110 0x40000000, /* kernel text mask */
111 0x7FFFFFFF, /* user stack top */
111 4, /* quantization of pc */112 4, /* quantization of pc */
112 4, /* szaddr */113 4, /* szaddr */
113 4, /* szreg */114 4, /* szreg */
utils/libmach/vobj.c+5−2
@@ -36,9 +36,12 @@ _readv(Biobuf *bp, Prog *p) · 35 unmodified lines
36 if(as < 0)36 if(as < 0)
37 return 0;37 return 0;
38 p->kind = aNone;38 p->kind = aNone;
39 p->sig = 0;
39 if(as == ANAME || as == ASIGNAME){40 if(as == ANAME || as == ASIGNAME){
40 if(as == ASIGNAME)41 if(as == ASIGNAME){
41 skip(bp, 4); /* signature */42 Bread(bp, &p->sig, 4);
43 p->sig = beswal(p->sig);
44 }
42 p->kind = aName;45 p->kind = aName;
43 p->type = type2char(Bgetc(bp)); /* type */46 p->type = type2char(Bgetc(bp)); /* type */
44 p->sym = Bgetc(bp); /* sym */47 p->sym = Bgetc(bp); /* sym */