qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Aurelien Jarno <aurelien@aurel32.net>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [4227] fix dyngen on HPPA hosts
Date: Sun, 20 Apr 2008 20:19:55 +0000	[thread overview]
Message-ID: <E1Jng0x-0000Mj-A8@cvs.savannah.gnu.org> (raw)

Revision: 4227
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4227
Author:   aurel32
Date:     2008-04-20 20:19:54 +0000 (Sun, 20 Apr 2008)

Log Message:
-----------
fix dyngen on HPPA hosts

(Stuart Brady)

Modified Paths:
--------------
    trunk/dyngen.c

Modified: trunk/dyngen.c
===================================================================
--- trunk/dyngen.c	2008-04-20 20:19:44 UTC (rev 4226)
+++ trunk/dyngen.c	2008-04-20 20:19:54 UTC (rev 4227)
@@ -1759,7 +1759,36 @@
     }
 
     if (gen_switch == 2) {
-        fprintf(outfile, "DEF(%s, %d, %d)\n", name + 3, nb_args, copy_size);
+
+#if defined(HOST_HPPA)
+	int op_size = copy_size;
+	int has_stubs = 0;
+	char relname[256];
+	int type, is_label;
+
+	for (i = 0, rel = relocs; i < nb_relocs; i++, rel++) {
+	    if (rel->r_offset >= start_offset &&
+		rel->r_offset < start_offset + copy_size) {
+		sym_name = get_rel_sym_name(rel);
+		sym_name = strtab + symtab[ELF32_R_SYM(rel->r_info)].st_name;
+		is_label = get_reloc_expr(relname, sizeof(relname), sym_name);
+		type = ELF32_R_TYPE(rel->r_info);
+
+		if (!is_label && type == R_PARISC_PCREL17F) {
+		    has_stubs = 1;
+		    op_size += 8; /* ldil and be,n instructions */
+		}
+	    }
+	}
+
+	if (has_stubs)
+	    op_size += 4; /* b,l,n instruction, to skip past the stubs */
+
+	fprintf(outfile, "DEF(%s, %d, %d)\n", name + 3, nb_args, op_size);
+#else
+	fprintf(outfile, "DEF(%s, %d, %d)\n", name + 3, nb_args, copy_size);
+#endif
+
     } else if (gen_switch == 1) {
 
         /* output C code */

                 reply	other threads:[~2008-04-20 20:19 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=E1Jng0x-0000Mj-A8@cvs.savannah.gnu.org \
    --to=aurelien@aurel32.net \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).