qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-21 23:34:42 -07:00
Code Releases Activity

runtime: make arm work on Ubuntu Natty qemu

Browse Source 
R=golang-dev, r
CC=golang-dev
https://golang.org/cl/4963050
This commit is contained in:
Russ Cox 2011-08-31 07:02:46 -04:00
parent 0cfa0fe242
commit 4304de6e0c
3 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cmd/ld/elf.c
View File

@ -77,6 +77,19 @@ elf64phdr(ElfPhdr *e)
void void
elf32phdr(ElfPhdr *e) elf32phdr(ElfPhdr *e)
{ {
int frag;
if(e->type == PT_LOAD) {
// Correct ELF loaders will do this implicitly,
// but buggy ELF loaders like the one in some
// versions of QEMU won't.
frag = e->vaddr&(e->align-1);
e->off -= frag;
e->vaddr -= frag;
e->paddr -= frag;
e->filesz += frag;
e->memsz += frag;
}
LPUT(e->type); LPUT(e->type);
LPUT(e->off); LPUT(e->off);
LPUT(e->vaddr); LPUT(e->vaddr);

17
src/pkg/runtime/linux/mem.c
View File

@ -6,23 +6,26 @@
enum enum
{ {
ENOMEM = 12, ENOMEM = 12,
_PAGE_SIZE = 4096,
}; };
static int32 static int32
addrspace_free(void *v, uintptr n) addrspace_free(void *v, uintptr n)
{ {
uintptr page_size = 4096; int32 errval;
uintptr chunk;
uintptr off; uintptr off;
int8 one_byte; static byte vec[4096];
for(off = 0; off < n; off += page_size) { for(off = 0; off < n; off += chunk) {
int32 errval = runtime·mincore((int8 *)v + off, page_size, (void *)&one_byte); chunk = _PAGE_SIZE * sizeof vec;
if(chunk > (n - off))
chunk = n - off;
errval = runtime·mincore((int8*)v + off, chunk, vec);
// errval is 0 if success, or -(error_code) if error. // errval is 0 if success, or -(error_code) if error.
if (errval == 0 || errval != -ENOMEM) if (errval == 0 || errval != -ENOMEM)
return 0; return 0;
} }
USED(v);
USED(n);
return 1; return 1;
} }
@ -72,7 +75,7 @@ runtime·SysReserve(void *v, uintptr n)
return v; return v;
p = runtime·mmap(v, n, PROT_NONE, MAP_ANON|MAP_PRIVATE, -1, 0); p = runtime·mmap(v, n, PROT_NONE, MAP_ANON|MAP_PRIVATE, -1, 0);
if(p < (void*)4096) { if((uintptr)p < 4096 || -(uintptr)p < 4096) {
return nil; return nil;
} }
return p; return p;

11
src/pkg/runtime/malloc.goc
View File

@ -248,6 +248,7 @@ runtime·mallocinit(void)
byte *p; byte *p;
uintptr arena_size, bitmap_size; uintptr arena_size, bitmap_size;
extern byte end[]; extern byte end[];
byte *want;
runtime·InitSizes(); runtime·InitSizes();
@ -307,9 +308,13 @@ runtime·mallocinit(void)
// not as an absolute requirement. If we ask for the end // not as an absolute requirement. If we ask for the end
// of the data segment but the operating system requires // of the data segment but the operating system requires
// a little more space before we can start allocating, it will // a little more space before we can start allocating, it will
// give out a slightly higher pointer. That's fine. // give out a slightly higher pointer. Except QEMU, which
// Run with what we get back. // is buggy, as usual: it won't adjust the pointer upward.
p = runtime·SysReserve(end, bitmap_size + arena_size); // So adjust it upward a little bit ourselves: 1/4 MB to get
// away from the running binary image and then round up
// to a MB boundary.
want = (byte*)(((uintptr)end + (1<<18) + (1<<20) - 1)&~((1<<20)-1));
p = runtime·SysReserve(want, bitmap_size + arena_size);
if(p == nil) if(p == nil)
runtime·throw("runtime: cannot reserve arena virtual address space"); runtime·throw("runtime: cannot reserve arena virtual address space");
} }