Re: [Qemu-devel] qemu/target-i386 op.c ops_sse.h

[Filip Navara]

Filip Navara wrote:

> Fabrice Bellard wrote:
>
> > CVSROOT:    /cvsroot/qemu
> > Module name:    qemu
> > Branch:    
> > Changes by:    Fabrice Bellard <address@hidden>    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.36&tr2=1.37&r1=text&r2=text 
> >
> > http://savannah.gnu.org/cgi-bin/viewcvs/qemu/qemu/target-i386/ops_sse.h.diff?tr1=1.5&tr2=1.6&r1=text&r2=text 
> >
> >  
> This breaks compilation on Windows... the attached patch fixes it.

And this time with the correct patch...

- 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 -0000       1.39
+++ dyngen.c    27 Apr 2005 13:40:23 -0000
@@ -635,6 +635,8 @@ static char *get_rel_sym_name(EXE_RELOC 
     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;
 }
 
@@ -1698,6 +1700,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);