From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1Jng10-0000ae-Qo
	for qemu-devel@nongnu.org; Sun, 20 Apr 2008 16:19:58 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1Jng0z-0000ZC-Vi
	for qemu-devel@nongnu.org; Sun, 20 Apr 2008 16:19:58 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Jng0z-0000Ym-Mk
	for qemu-devel@nongnu.org; Sun, 20 Apr 2008 16:19:57 -0400
Received: from savannah.gnu.org ([199.232.41.3] helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <aurelien@aurel32.net>)
	id 1Jng0z-00060f-1Y
	for qemu-devel@nongnu.org; Sun, 20 Apr 2008 16:19:57 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <aurelien@aurel32.net>) id 1Jng0x-0000Mw-VK
	for qemu-devel@nongnu.org; Sun, 20 Apr 2008 20:19:56 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aurel32@savannah.gnu.org>) id 1Jng0x-0000Mj-A8
	for qemu-devel@nongnu.org; Sun, 20 Apr 2008 20:19:55 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1Jng0x-0000Mj-A8@cvs.savannah.gnu.org>
Date: Sun, 20 Apr 2008 20:19:55 +0000
Subject: [Qemu-devel] [4227] fix dyngen on HPPA hosts
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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 */