Some fixes: delinted and fixed alignment bug (bloody sizeof strikes again)
This commit is contained in:
parent
159d8ec57d
commit
b3287b2b0f
4 changed files with 4 additions and 4 deletions
|
@ -20,6 +20,7 @@ static getexternal();
|
||||||
static redefine();
|
static redefine();
|
||||||
static transfer();
|
static transfer();
|
||||||
|
|
||||||
|
extern ind_t savechar();
|
||||||
/*
|
/*
|
||||||
* Get section sizes and symboltable information from present module.
|
* Get section sizes and symboltable information from present module.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -45,7 +45,6 @@ static ind_t refused;
|
||||||
sbreak(incr)
|
sbreak(incr)
|
||||||
ind_t incr;
|
ind_t incr;
|
||||||
{
|
{
|
||||||
extern char *brk();
|
|
||||||
unsigned int inc;
|
unsigned int inc;
|
||||||
|
|
||||||
incr = (incr + (GRANULE - 1)) & ~(GRANULE - 1);
|
incr = (incr + (GRANULE - 1)) & ~(GRANULE - 1);
|
||||||
|
@ -54,7 +53,7 @@ sbreak(incr)
|
||||||
if ((refused && refused < incr) ||
|
if ((refused && refused < incr) ||
|
||||||
(sizeof(char *) < sizeof(long) &&
|
(sizeof(char *) < sizeof(long) &&
|
||||||
(inc != incr || BASE + inc < BASE)) ||
|
(inc != incr || BASE + inc < BASE)) ||
|
||||||
(int) brk(BASE + incr) == -1) {
|
brk(BASE + incr) == -1) {
|
||||||
if (!refused || refused > incr)
|
if (!refused || refused > incr)
|
||||||
refused = incr;
|
refused = incr;
|
||||||
return -1;
|
return -1;
|
||||||
|
|
|
@ -35,7 +35,7 @@ extern struct memory mems[];
|
||||||
#define address(piece,offset) (mems[(piece)].mem_base+(offset))
|
#define address(piece,offset) (mems[(piece)].mem_base+(offset))
|
||||||
#define modulptr(offset) (mems[ALLOMODL].mem_base+core_position+(offset))
|
#define modulptr(offset) (mems[ALLOMODL].mem_base+core_position+(offset))
|
||||||
|
|
||||||
#define int_align(sz) (((sz)+(sizeof(int)-1))&~(sizeof(int)-1))
|
#define int_align(sz) (((sz)+(sizeof(int)-1))&~(int)(sizeof(int)-1))
|
||||||
|
|
||||||
extern ind_t core_position;
|
extern ind_t core_position;
|
||||||
extern ind_t hard_alloc();
|
extern ind_t hard_alloc();
|
||||||
|
|
|
@ -547,7 +547,7 @@ nextrelo()
|
||||||
return walkrelo++;
|
return walkrelo++;
|
||||||
|
|
||||||
if (relind == _RELSIZ) {
|
if (relind == _RELSIZ) {
|
||||||
int i = cnt_relos >= _RELSIZ ? _RELSIZ : cnt_relos;
|
unsigned int i = cnt_relos >= _RELSIZ ? _RELSIZ : cnt_relos;
|
||||||
|
|
||||||
cnt_relos -= i;
|
cnt_relos -= i;
|
||||||
rd_relo(relobuf, i);
|
rd_relo(relobuf, i);
|
||||||
|
|
Loading…
Reference in a new issue