Fabrice Bellard wrote:
CVSROOT:/cvsroot/qemu
Module name:qemu
Branch:
Changes by: Fabrice Bellard [EMAIL PROTECTED] 05/04/26 20:38:17
Modified files:
target-i386: op.c ops_sse.h
Log message:
removed switches in op.c (Paul Brook)
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/qemu/qemu/target-i386/op.c.diff?tr1=1.36tr2=1.37r1=textr2=text
http://savannah.gnu.org/cgi-bin/viewcvs/qemu/qemu/target-i386/ops_sse.h.diff?tr1=1.5tr2=1.6r1=textr2=text
This breaks compilation on Windows... the attached patch fixes it.
- Filip
Index: dyngen.c
===
RCS file: /cvsroot/qemu/qemu/dyngen.c,v
retrieving revision 1.39
diff -u -p -r1.39 dyngen.c
--- dyngen.c 7 Apr 2005 22:20:28 - 1.39
+++ dyngen.c 27 Apr 2005 13:21:51 -
@@ -604,26 +604,6 @@ void sym_ent_name(struct external_syment
}
}
-char *name_for_dotdata(struct coff_rel *rel)
-{
- int i;
- struct coff_sym *sym;
- uint32_t text_data;
-
- text_data = *(uint32_t *)(text + rel-r_offset);
-
- for (i = 0, sym = symtab; i nb_syms; i++, sym++) {
- if (sym-st_syment-e_scnum == data_shndx
-text_data = sym-st_value
-text_data sym-st_value + sym-st_size) {
-
-return sym-st_name;
-
- }
- }
- return NULL;
-}
-
static char *get_sym_name(EXE_SYM *sym)
{
return sym-st_name;
@@ -633,8 +613,8 @@ static char *get_rel_sym_name(EXE_RELOC
{
char *name;
name = get_sym_name(symtab + *(uint32_t *)(rel-r_reloc-r_symndx));
-if (!strcmp(name, .data))
-name = name_for_dotdata(rel);
+if (name[0] == '.')
+return NULL;
return name;
}
@@ -782,20 +762,25 @@ int load_object(const char *filename)
}
-/* find text relocations, if any */
-sec = shdr[coff_text_shndx];
-coff_relocs = load_data(fd, sec-s_relptr, sec-s_nreloc*RELSZ);
-nb_relocs = sec-s_nreloc;
+/* find relocations, if any */
+for (j = 0, nb_relocs = 0; j fhdr.f_nscns; j++) {
+nb_relocs += shdr[j].s_nreloc;
+}
+relocs = malloc(sizeof(struct coff_rel) * nb_relocs);
/* set coff relocation */
-relocs = malloc(sizeof(struct coff_rel) * nb_relocs);
-for (i = 0, ext_rel = coff_relocs, rel = relocs; i nb_relocs;
- i++, ext_rel++, rel++) {
-memset(rel, 0, sizeof(*rel));
-rel-r_reloc = ext_rel;
-rel-r_offset = *(uint32_t *)ext_rel-r_vaddr;
-rel-r_type = *(uint16_t *)ext_rel-r_type;
+for (j = 0, rel = relocs; j fhdr.f_nscns; j++) {
+sec = shdr[j];
+coff_relocs = load_data(fd, sec-s_relptr, sec-s_nreloc*RELSZ);
+for (i = 0, ext_rel = coff_relocs; i sec-s_nreloc;
+ i++, ext_rel++, rel++) {
+memset(rel, 0, sizeof(*rel));
+rel-r_reloc = ext_rel;
+rel-r_offset = *(uint32_t *)ext_rel-r_vaddr;
+rel-r_type = *(uint16_t *)ext_rel-r_type;
+}
}
+
return 0;
}
@@ -1303,6 +1288,8 @@ int arm_emit_ldr_info(const char *name,
for(i = 0, rel = relocs;i nb_relocs; i++, rel++) {
if (rel-r_offset == (pc_offset + start_offset)) {
sym_name = get_rel_sym_name(rel);
+if (!sym_name)
+continue;
/* the compiler leave some unnecessary references to the code */
get_reloc_expr(relname, sizeof(relname), sym_name);
type = ELF32_R_TYPE(rel-r_info);
@@ -1698,6 +1685,8 @@ void gen_code(const char *name, host_ulo
if (rel-r_offset = start_offset
rel-r_offset start_offset + copy_size) {
sym_name = get_rel_sym_name(rel);
+if (!sym_name)
+continue;
if (strstart(sym_name, __op_jmp, p)) {
int n;
n = strtol(p, NULL, 10);
___
Qemu-devel mailing list
Qemu-devel@nongnu.org
http://lists.nongnu.org/mailman/listinfo/qemu-devel
