tfix various bugs for sunos - plan9port - [fork] Plan 9 from user space
HTML git clone git://src.adamsgaard.dk/plan9port
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 929ba9b98f7ded89476ad6bce547e15981bc723b
DIR parent 20b33daf595da71a2287c01a4d6bc7078348d086
HTML Author: rsc <devnull@localhost>
Date: Tue, 20 Apr 2004 00:54:58 +0000
fix various bugs for sunos
Diffstat:
M src/libmach/crackelf.c | 2 +-
M src/libmach/crackmacho.c | 2 +-
M src/libmach/dwarfinfo.c | 2 +-
M src/libmach/dwarfpc.c | 8 ++++----
M src/libmach/elf.c | 4 ++--
M src/libmach/ieee.c | 8 ++++----
6 files changed, 13 insertions(+), 13 deletions(-)
---
DIR diff --git a/src/libmach/crackelf.c b/src/libmach/crackelf.c
t@@ -68,7 +68,7 @@ crackelf(int fd, Fhdr *fp)
if(elfmap(elf, s1) >= 0 && elfmap(elf, s2) >= 0){
fp->stabs.stabbase = s1->base;
fp->stabs.stabsize = s1->size;
- fp->stabs.strbase = s2->base;
+ fp->stabs.strbase = (char*)s2->base;
fp->stabs.strsize = s2->size;
fp->stabs.e2 = elf->hdr.e2;
fp->stabs.e4 = elf->hdr.e4;
DIR diff --git a/src/libmach/crackmacho.c b/src/libmach/crackmacho.c
t@@ -117,7 +117,7 @@ crackmacho(int fd, Fhdr *fp)
if(i < m->ncmd){
fp->stabs.stabbase = load(fp->fd, m->cmd[i].sym.symoff, m->cmd[i].sym.nsyms*16);
fp->stabs.stabsize = m->cmd[i].sym.nsyms*16;
- fp->stabs.strbase = load(fp->fd, m->cmd[i].sym.stroff, m->cmd[i].sym.strsize);
+ fp->stabs.strbase = (char*)load(fp->fd, m->cmd[i].sym.stroff, m->cmd[i].sym.strsize);
if(fp->stabs.stabbase == nil || fp->stabs.strbase == nil){
fp->stabs.stabbase = nil;
fp->stabs.strbase = nil;
DIR diff --git a/src/libmach/dwarfinfo.c b/src/libmach/dwarfinfo.c
t@@ -544,7 +544,7 @@ getstring(DwarfBuf *b, int form, char **s)
/* don't return error - maybe can proceed */
*s = nil;
}else
- *s = b->d->str.data + u;
+ *s = (char*)b->d->str.data + u;
return 0;
}
DIR diff --git a/src/libmach/dwarfpc.c b/src/libmach/dwarfpc.c
t@@ -109,12 +109,12 @@ dwarfpctoline(Dwarf *d, ulong pc, char **cdir, char **dir, char **file, ulong *l
}
/* just skip the files and dirs for now; we'll come back */
- dirs = b.p;
+ dirs = (char*)b.p;
while(b.p!=nil && *b.p!=0)
dwarfgetstring(&b);
dwarfget1(&b);
- files = b.p;
+ files = (char*)b.p;
while(b.p!=nil && *b.p!=0){
dwarfgetstring(&b);
dwarfget128(&b);
t@@ -278,7 +278,7 @@ dwarfpctoline(Dwarf *d, ulong pc, char **cdir, char **dir, char **file, ulong *l
*line = emit.line;
/* skip over first emit.file-2 guys */
- b.p = files;
+ b.p = (uchar*)files;
for(i=emit.file-1; i > 0 && b.p!=nil && *b.p!=0; i--){
dwarfgetstring(&b);
dwarfget128(&b);
t@@ -315,7 +315,7 @@ dwarfpctoline(Dwarf *d, ulong pc, char **cdir, char **dir, char **file, ulong *l
if(i == 0)
*dir = nil;
else{
- b.p = dirs;
+ b.p = (uchar*)dirs;
for(i--; i>0 && b.p!=nil && *b.p!=0; i--)
dwarfgetstring(&b);
if(b.p==nil || *b.p==0){
DIR diff --git a/src/libmach/elf.c b/src/libmach/elf.c
t@@ -195,7 +195,7 @@ elfinit(int fd)
for(i=0; i<e->nsect; i++)
if(e->sect[i].name)
- e->sect[i].name = s->base + (ulong)e->sect[i].name;
+ e->sect[i].name = (char*)s->base + (ulong)e->sect[i].name;
e->symtab = elfsection(e, ".symtab");
if(e->symtab){
t@@ -375,7 +375,7 @@ elfsym(Elf *elf, int i, ElfSym *sym)
if(elfmap(elf, symtab) < 0 || elfmap(elf, strtab) < 0)
return -1;
p = symtab->base + i * sizeof(ElfSymBytes);
- s = strtab->base;
+ s = (char*)strtab->base;
x = elf->hdr.e4(p);
if(x >= strtab->size){
werrstr("bad symbol name offset 0x%lux", x);
DIR diff --git a/src/libmach/ieee.c b/src/libmach/ieee.c
t@@ -18,9 +18,9 @@ ieeeftoa64(char *buf, uint n, u32int h, u32int l)
return 0;
- if(h & (1L<<31)){
+ if(h & (1UL<<31)){
*buf++ = '-';
- h &= ~(1L<<31);
+ h &= ~(1UL<<31);
}else
*buf++ = ' ';
n--;
t@@ -55,9 +55,9 @@ ieeeftoa32(char *buf, uint n, u32int h)
if (n <= 0)
return 0;
- if(h & (1L<<31)){
+ if(h & (1UL<<31)){
*buf++ = '-';
- h &= ~(1L<<31);
+ h &= ~(1UL<<31);
}else
*buf++ = ' ';
n--;