Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id ABE607A281 for ; Mon, 3 Oct 2016 02:46:49 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 2814085E98; Mon, 3 Oct 2016 02:46:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id ACCFE85E27 for ; Mon, 3 Oct 2016 02:46:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id FrKIr-ffv9b0 for ; Mon, 3 Oct 2016 02:46:48 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 257DC84CE5 for ; Mon, 3 Oct 2016 02:46:48 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1C32EFBD2; Mon, 3 Oct 2016 02:46:48 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1475462808237220" MIME-Version: 1.0 Date: Mon, 3 Oct 2016 02:46:48 +0000 From: "Maya Rashish" Subject: CVS commit: pkgsrc/lang/spidermonkey17 To: pkgsrc-changes@NetBSD.org Reply-To: maya@netbsd.org X-Mailer: log_accum Message-Id: <20161003024648.1C32EFBD2@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1475462808237220 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: maya Date: Mon Oct 3 02:46:48 UTC 2016 Modified Files: pkgsrc/lang/spidermonkey17: distinfo Added Files: pkgsrc/lang/spidermonkey17/patches: patch-js_src_assembler_assembler_MIPSAssembler.h patch-js_src_assembler_wtf_Platform.h Log Message: spidermonkey17: don't reject MIPS ABIs that aren't n32. switch the use of nops (most likely used to eliminate hazards too) to ehb/ssnop. nop doesn't eliminate hazards on a superscalar MIPS CPU. probably helps the report of vague problems on loongson2f. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/spidermonkey17/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/lang/spidermonkey17/patches/patch-js_src_assembler_assembler_MIPSAssembler.h \ pkgsrc/lang/spidermonkey17/patches/patch-js_src_assembler_wtf_Platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1475462808237220 Content-Disposition: inline Content-Length: 3269 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/spidermonkey17/distinfo diff -u pkgsrc/lang/spidermonkey17/distinfo:1.3 pkgsrc/lang/spidermonkey17/distinfo:1.4 --- pkgsrc/lang/spidermonkey17/distinfo:1.3 Mon Sep 5 11:43:23 2016 +++ pkgsrc/lang/spidermonkey17/distinfo Mon Oct 3 02:46:47 2016 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2016/09/05 11:43:23 jperkin Exp $ +$NetBSD: distinfo,v 1.4 2016/10/03 02:46:47 maya Exp $ SHA1 (mozjs17.0.0.tar.gz) = 7805174898c34e5d3c3b256117af9944ba825c89 RMD160 (mozjs17.0.0.tar.gz) = 2fa3a891da2a7a09019f67c1555c03bcdc51e6c5 @@ -8,6 +8,8 @@ SHA1 (patch-ak) = 7cebf3e58ad14598fbe98c SHA1 (patch-as) = c8e3aa309ae5115a8f4c17d477674f93afead538 SHA1 (patch-bd) = c8ed2110c8b699d6880723dccf62e6976edfa65e SHA1 (patch-bf) = 7d18ec3cad441174a71770e7fa22b1cd2029d55b +SHA1 (patch-js_src_assembler_assembler_MIPSAssembler.h) = 7912848726ec0e7f6181ec70a20c04bcf3ce4ee2 +SHA1 (patch-js_src_assembler_wtf_Platform.h) = 113b746d572f5660cf371f66b69657f6069bab24 SHA1 (patch-js_src_config_milestone.pl) = 84dbc588e82ba1a6bcc901abe9b77ba316acac15 SHA1 (patch-js_src_config_system-headers) = a9c5bc2d2c822eb3bd5e8f4ba43407f89b57c009 SHA1 (patch-js_src_jscpucfg.h) = a65222bcf99e91cd00d6ad40d6fcedd0c3d67ec9 Added files: Index: pkgsrc/lang/spidermonkey17/patches/patch-js_src_assembler_assembler_MIPSAssembler.h diff -u /dev/null pkgsrc/lang/spidermonkey17/patches/patch-js_src_assembler_assembler_MIPSAssembler.h:1.1 --- /dev/null Mon Oct 3 02:46:48 2016 +++ pkgsrc/lang/spidermonkey17/patches/patch-js_src_assembler_assembler_MIPSAssembler.h Mon Oct 3 02:46:47 2016 @@ -0,0 +1,19 @@ +$NetBSD: patch-js_src_assembler_assembler_MIPSAssembler.h,v 1.1 2016/10/03 02:46:47 maya Exp $ + +blindly convert all nops to EHB / SSNOP +nop doesn't eliminate hazards in a superscalar CPU + +--- js/src/assembler/assembler/MIPSAssembler.h.orig 2013-02-11 22:33:22.000000000 +0000 ++++ js/src/assembler/assembler/MIPSAssembler.h +@@ -243,7 +243,10 @@ public: + + void nop() + { +- emitInst(0x00000000); ++ /* nop is insufficient for eliminating hazards ++ * in a superscalar CPU. blindly convert all to ++ * MIPSNNR6 ehb / ssnop, at a performance cost. */ ++ emitInst(0x000000c0); + } + + /* Need to insert one load data delay nop for mips1. */ Index: pkgsrc/lang/spidermonkey17/patches/patch-js_src_assembler_wtf_Platform.h diff -u /dev/null pkgsrc/lang/spidermonkey17/patches/patch-js_src_assembler_wtf_Platform.h:1.1 --- /dev/null Mon Oct 3 02:46:48 2016 +++ pkgsrc/lang/spidermonkey17/patches/patch-js_src_assembler_wtf_Platform.h Mon Oct 3 02:46:47 2016 @@ -0,0 +1,16 @@ +$NetBSD: patch-js_src_assembler_wtf_Platform.h,v 1.1 2016/10/03 02:46:47 maya Exp $ + +don't error out for other MIPS ABIs. + +--- js/src/assembler/wtf/Platform.h.orig 2013-02-11 22:33:22.000000000 +0000 ++++ js/src/assembler/wtf/Platform.h +@@ -139,8 +139,7 @@ + + /* WTF_CPU_MIPS - MIPS 32-bit */ + /* Note: Only O32 ABI is tested, so we enable it for O32 ABI for now. */ +-#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) \ +- && defined(_ABIO32) ++#if (defined(mips) || defined(__mips__) || defined(MIPS) || defined(_MIPS_)) + #define WTF_CPU_MIPS 1 + #if defined(__MIPSEB__) + #define WTF_CPU_BIG_ENDIAN 1 --_----------=_1475462808237220--