From patchwork Sat Mar 24 17:47:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 148528 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C17C1B6EF3 for ; Sun, 25 Mar 2012 04:48:38 +1100 (EST) Received: from localhost ([::1]:41018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBV4u-0007fd-3O for incoming@patchwork.ozlabs.org; Sat, 24 Mar 2012 13:48:36 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBV4B-0005tx-Ph for qemu-devel@nongnu.org; Sat, 24 Mar 2012 13:47:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SBV49-0007aB-Kp for qemu-devel@nongnu.org; Sat, 24 Mar 2012 13:47:51 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:60699) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SBV49-0007ZH-Bq for qemu-devel@nongnu.org; Sat, 24 Mar 2012 13:47:49 -0400 Received: by mail-pb0-f45.google.com with SMTP id uo5so4587773pbc.4 for ; Sat, 24 Mar 2012 10:47:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=OeIZshlm4DaHRGOaOEw4LDLB6bZCPScWMgCHH1YRun8=; b=t06DEn+IPqtq22D3f4ObUly8W7eiOzbLuNrOW4g+uHOb74pQir/YdW1EBOPoVvyYXk iIlz6mD1a5Nsy9kcDImvtQ3GaJBkmblto9gCNT6LzHjqG6fR+tc66GGRn+X0E5P0V3U/ +pXaxz9MXyO6vvf0WizMtyuIPseZT7qZCvp2V5a7cAWZ7wGsB/VtBOsfJAawkBumO0Ea OxojZI2W5TBRVEzeK8Lyn/vOmN0zySIfP6FoBBvknArBIY00nR/cvyW2qmK48GvGU1+t BKueO5yE0t8RGvpprDcic6ZxA1Hw/Ztfa8ljCxpd0ycuX5wEBuBdUMmEk2TSUMZkFopw 4NRw== Received: by 10.68.197.137 with SMTP id iu9mr31176042pbc.110.1332611268450; Sat, 24 Mar 2012 10:47:48 -0700 (PDT) Received: from pebble.twiddle.home ([173.160.232.49]) by mx.google.com with ESMTPS id i6sm8492316pbe.18.2012.03.24.10.47.47 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 24 Mar 2012 10:47:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 24 Mar 2012 10:47:39 -0700 Message-Id: <1332611259-14940-5-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1332611259-14940-1-git-send-email-rth@twiddle.net> References: <1332611259-14940-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: blauwirbel@gmail.com Subject: [Qemu-devel] [PATCH 4/4] tcg-sparc: Add debug_frame support. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org --- elf.h | 15 +++++++++++ tcg/sparc/tcg-target.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 0 deletions(-) diff --git a/elf.h b/elf.h index 310e05a..36bcac4 100644 --- a/elf.h +++ b/elf.h @@ -346,6 +346,21 @@ typedef struct { #define R_MIPS_HIVENDOR 127 +/* SUN SPARC specific definitions. */ + +/* Values for Elf64_Ehdr.e_flags. */ + +#define EF_SPARCV9_MM 3 +#define EF_SPARCV9_TSO 0 +#define EF_SPARCV9_PSO 1 +#define EF_SPARCV9_RMO 2 +#define EF_SPARC_LEDATA 0x800000 /* little endian data */ +#define EF_SPARC_EXT_MASK 0xFFFF00 +#define EF_SPARC_32PLUS 0x000100 /* generic V8+ features */ +#define EF_SPARC_SUN_US1 0x000200 /* Sun UltraSPARC1 extensions */ +#define EF_SPARC_HAL_R1 0x000400 /* HAL R1 extensions */ +#define EF_SPARC_SUN_US3 0x000800 /* Sun UltraSPARCIII extensions */ + /* * Sparc ELF relocation types */ diff --git a/tcg/sparc/tcg-target.c b/tcg/sparc/tcg-target.c index 491c979..247a278 100644 --- a/tcg/sparc/tcg-target.c +++ b/tcg/sparc/tcg-target.c @@ -1624,3 +1624,66 @@ static void tcg_target_init(TCGContext *s) tcg_regset_set_reg(s->reserved_regs, TCG_REG_O7); tcg_add_target_add_op_defs(sparc_op_defs); } + +#if TCG_TARGET_REG_BITS == 64 +# define ELF_HOST_MACHINE EM_SPARCV9 +#elif defined(__sparc_v8plus__) +# define ELF_HOST_MACHINE EM_SPARC32PLUS +# define ELF_HOST_FLAGS EF_SPARC_32PLUS +#else +# define ELF_HOST_MACHINE EM_SPARC +#endif + +typedef struct { + uint32_t len __attribute__((aligned((sizeof(void *))))); + uint32_t id; + uint8_t version; + char augmentation[1]; + uint8_t code_align; + uint8_t data_align; + uint8_t return_column; +} DebugFrameCIE; + +typedef struct { + uint32_t len __attribute__((aligned((sizeof(void *))))); + uint32_t cie_offset; + tcg_target_long func_start __attribute__((packed)); + tcg_target_long func_len __attribute__((packed)); + uint8_t def_cfa[TCG_TARGET_REG_BITS == 64 ? 4 : 2]; + uint8_t win_save; + uint8_t ret_save[3]; +} DebugFrameFDE; + +typedef struct { + DebugFrameCIE cie; + DebugFrameFDE fde; +} DebugFrame; + +static DebugFrame debug_frame = { + .cie.len = sizeof(DebugFrameCIE)-4, /* length after .len member */ + .cie.id = -1, + .cie.version = 1, + .cie.code_align = 1, + .cie.data_align = -sizeof(void *) & 0x7f, + .cie.return_column = 15, /* o7 */ + + .fde.len = sizeof(DebugFrameFDE)-4, /* length after .len member */ + .fde.def_cfa = { +#if TCG_TARGET_REG_BITS == 64 + 12, 30, /* DW_CFA_def_cfa i6, 2047 */ + (2047 & 0x7f) | 0x80, (2047 >> 7) +#else + 13, 30 /* DW_CFA_def_cfa_register i6 */ +#endif + }, + .fde.win_save = 0x2d, /* DW_CFA_GNU_window_save */ + .fde.ret_save = { 9, 15, 31 }, /* DW_CFA_register o7, i7 */ +}; + +void tcg_register_jit(void *buf, size_t buf_size) +{ + debug_frame.fde.func_start = (tcg_target_long) buf; + debug_frame.fde.func_len = buf_size; + + tcg_register_jit_int(buf, buf_size, &debug_frame, sizeof(debug_frame)); +}