uefi-ref/yasm
1
0
Fork 0
mirror of https://github.com/yasm/yasm synced 2026-08-26 22:26:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Interpret vstart as linear address

Browse source 
Changed segment:offset calculations so that vstart = 16*segment +
offset and vseg = segment instead of vstart = offset. Without this the
existing code to infer vstart addresses is not useful.
This commit is contained in:
Jannis Harder 2012-07-29 17:19:46 +02:00
parent 15e9012b77
commit c02c6c72d0
1 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/objfmts/bin/bin-objfmt.c
View file

@ -512,11 +512,15 @@ get_ssym_value(yasm_symrec *sym, unsigned long line)
offset = yasm_intnum_copy(offset);
if (bsymd->which == SSYM_VSTART && bsd->ivseg != NULL)
if (bsymd->which == SSYM_VSTART && bsd->ivseg != NULL) {
yasm_intnum *tmp = yasm_intnum_create_int(16);
yasm_intnum_calc(tmp, YASM_EXPR_MUL, bsd->ivseg);
yasm_intnum_calc(offset, YASM_EXPR_SUB, tmp);
yasm_intnum_destroy(tmp);
expr = yasm_expr_create(YASM_EXPR_SEGOFF,
yasm_expr_int(yasm_intnum_copy(bsd->ivseg)),
yasm_expr_int(offset), line);
else
} else
expr = yasm_expr_create_ident(yasm_expr_int(offset), line);
return expr;
@ -550,7 +554,11 @@ bin_objfmt_expr_xform(/*@returned@*/ /*@only@*/ yasm_expr *e,
yasm_expr *sube;
yasm_intnum *seg;
seg = yasm_intnum_copy(bsd->ivseg);
seg = yasm_intnum_create_int(16);
yasm_intnum_calc(seg, YASM_EXPR_MUL, bsd->ivseg);
yasm_intnum_calc(dist, YASM_EXPR_SUB, seg);
yasm_intnum_set(seg, bsd->ivseg);
sube = yasm_expr_create(YASM_EXPR_SEGOFF,
yasm_expr_int(seg),
yasm_expr_int(dist), e->line);