From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.bugs Subject: bug#10042: VIRT_ADDR_VARIES fix for Emacs under valgrind etc. Date: Sun, 13 Nov 2011 20:55:03 -0800 Organization: UCLA Computer Science Department Message-ID: <4EC09F27.1080407@cs.ucla.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Trace: dough.gmane.org 1321246542 5215 80.91.229.12 (14 Nov 2011 04:55:42 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 14 Nov 2011 04:55:42 +0000 (UTC) To: 10042@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Nov 14 05:55:38 2011 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RPoa1-00024K-UP for geb-bug-gnu-emacs@m.gmane.org; Mon, 14 Nov 2011 05:55:38 +0100 Original-Received: from localhost ([::1]:54065 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPoa0-0002KS-Ku for geb-bug-gnu-emacs@m.gmane.org; Sun, 13 Nov 2011 23:55:36 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:42107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPoZw-0002KN-Nr for bug-gnu-emacs@gnu.org; Sun, 13 Nov 2011 23:55:34 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RPoZv-0002wM-Bs for bug-gnu-emacs@gnu.org; Sun, 13 Nov 2011 23:55:32 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:46940) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPoZv-0002wI-8t for bug-gnu-emacs@gnu.org; Sun, 13 Nov 2011 23:55:31 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1RPoaQ-0004l8-IH for bug-gnu-emacs@gnu.org; Sun, 13 Nov 2011 23:56:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Paul Eggert Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 14 Nov 2011 04:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 10042 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.132124655018274 (code B ref -1); Mon, 14 Nov 2011 04:56:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 14 Nov 2011 04:55:50 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RPoaE-0004kh-8j for submit@debbugs.gnu.org; Sun, 13 Nov 2011 23:55:50 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1RPoaA-0004kT-9c for submit@debbugs.gnu.org; Sun, 13 Nov 2011 23:55:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RPoZY-0002vh-4x for submit@debbugs.gnu.org; Sun, 13 Nov 2011 23:55:09 -0500 Original-Received: from lists.gnu.org ([140.186.70.17]:33837) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPoZY-0002vJ-0W for submit@debbugs.gnu.org; Sun, 13 Nov 2011 23:55:08 -0500 Original-Received: from eggs.gnu.org ([140.186.70.92]:42084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPoZW-0002Hx-4A for bug-gnu-emacs@gnu.org; Sun, 13 Nov 2011 23:55:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RPoZU-0002sL-DO for bug-gnu-emacs@gnu.org; Sun, 13 Nov 2011 23:55:06 -0500 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:49588) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RPoZT-0002rY-VR for bug-gnu-emacs@gnu.org; Sun, 13 Nov 2011 23:55:04 -0500 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 777E8A60002 for ; Sun, 13 Nov 2011 20:55:02 -0800 (PST) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sRDZ91NP+APO for ; Sun, 13 Nov 2011 20:55:01 -0800 (PST) Original-Received: from [192.168.1.10] (pool-71-189-109-235.lsanca.fios.verizon.net [71.189.109.235]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id 4D3E539E800A for ; Sun, 13 Nov 2011 20:55:01 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux i686; rv:7.0.1) Gecko/20110929 Thunderbird/7.0.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Sun, 13 Nov 2011 23:56:02 -0500 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:53885 Archived-At: This is a followup to the thread that began at . This patch fixes a bug where Emacs won't run correctly under valgrind. As Andreas mentioned, without the patch Emacs probably isn't all that safe even when run outside of valgrind. # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: eggert@cs.ucla.edu-20111114043522-l0gmk07ckh964xtp # target_branch: bzr+ssh://eggert@bzr.savannah.gnu.org/emacs/trunk # testament_sha1: 6e35062324740218b862c3bc27e0aed206fee1ee # timestamp: 2011-11-13 20:42:27 -0800 # base_revision_id: rgm@gnu.org-20111114021401-gnrqc3mar3ra6cjp # # Begin patch === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-12 12:11:54 +0000 +++ src/ChangeLog 2011-11-14 04:35:22 +0000 @@ -1,3 +1,22 @@ +2011-11-14 Paul Eggert + + Standardize on VIRT_ADDR_VARIES behavior; otherwise, valgrind + does not work on some platforms. Problem reported by Andreas Schwab in + . + * puresize.h (pure, PURE_P): Always behave as if VIRT_ADDR_VARIES + is set, removing the need for VIRT_ADDRESS_VARIES. + (PURE_P): Use a more-efficient implementation that needs just one + comparison, not two: on x86-64 with GCC 4.6.2, this cut down the + number of instructions from 6 (xorl, cmpq, jge, xorl, cmpq, setge) + to 4 (xorl, subq, cmpq, setbe). + * alloc.c (pure): Always extern now, since that's the + VIRT_ADDR_VARIES behavior. + (PURE_POINTER_P): Use a single comparison, not two, for + consistency with the new puresize.h. + * lisp.h (PNTR_COMPARISON_TYPE): Remove; no longer needed. + * m/ibms390.h, m/intel386.h, m/template.h, s/cygwin.h, s/hpux10-20.h: + Remove VIRT_ADDR_VARIES no longer needed. + 2011-11-12 Eli Zaretskii * makefile.w32-in (HEAPSIZE): New variable, allows to build temacs === modified file 'src/alloc.c' --- src/alloc.c 2011-11-07 05:37:49 +0000 +++ src/alloc.c 2011-11-10 08:14:27 +0000 @@ -203,9 +203,6 @@ remapping on more recent systems because this is less important nowadays than in the days of small memories and timesharing. */ -#ifndef VIRT_ADDR_VARIES -static -#endif EMACS_INT pure[(PURESIZE + sizeof (EMACS_INT) - 1) / sizeof (EMACS_INT)] = {1,}; #define PUREBEG (char *) pure @@ -222,10 +219,7 @@ /* Value is non-zero if P points into pure space. */ #define PURE_POINTER_P(P) \ - (((PNTR_COMPARISON_TYPE) (P) \ - < (PNTR_COMPARISON_TYPE) ((char *) purebeg + pure_size)) \ - && ((PNTR_COMPARISON_TYPE) (P) \ - >= (PNTR_COMPARISON_TYPE) purebeg)) + ((uintptr_t) (P) - (uintptr_t) purebeg <= pure_size) /* Index in pure at which next pure Lisp object will be allocated.. */ === modified file 'src/lisp.h' --- src/lisp.h 2011-11-07 17:04:01 +0000 +++ src/lisp.h 2011-11-10 08:14:27 +0000 @@ -1877,9 +1877,6 @@ CHECK_NATNUM (tmp); \ XSETCDR ((x), tmp); \ } while (0) - -/* Cast pointers to this type to compare them. */ -#define PNTR_COMPARISON_TYPE uintptr_t /* Define a built-in function for calling from Lisp. `lname' should be the name to give the function in Lisp, === modified file 'src/m/ibms390.h' --- src/m/ibms390.h 2011-02-16 01:35:20 +0000 +++ src/m/ibms390.h 2011-11-10 08:14:27 +0000 @@ -17,11 +17,6 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ - -/* Define VIRT_ADDR_VARIES if the virtual addresses of - pure and impure space as loaded can vary, and even their - relative order cannot be relied on. - - Otherwise Emacs assumes that text space precedes data space, - numerically. */ -#define VIRT_ADDR_VARIES +/* This file is a placeholder -- it does not contain any definitions. + At some point we should probably fix this by removing the file + and removing all uses of it. */ === modified file 'src/m/intel386.h' --- src/m/intel386.h 2011-01-31 23:54:50 +0000 +++ src/m/intel386.h 2011-11-10 08:14:27 +0000 @@ -19,7 +19,6 @@ #ifdef WINDOWSNT -#define VIRT_ADDR_VARIES #define DATA_START get_data_start () #endif @@ -28,4 +27,3 @@ /* we cannot get the maximum address for brk */ #define ULIMIT_BREAK_VALUE (32*1024*1024) #endif - === modified file 'src/m/template.h' --- src/m/template.h 2011-02-16 01:35:20 +0000 +++ src/m/template.h 2011-11-10 08:14:27 +0000 @@ -21,14 +21,6 @@ does not define it automatically. Ones defined so far include m68k and many others */ -/* Define VIRT_ADDR_VARIES if the virtual addresses of - pure and impure space as loaded can vary, and even their - relative order cannot be relied on. - - Otherwise Emacs assumes that text space precedes data space, - numerically. */ -#define VIRT_ADDR_VARIES - /* After adding support for a new machine, modify the large case statement in configure.in to recognize reasonable configuration names, and add a description of the system to === modified file 'src/puresize.h' --- src/puresize.h 2011-06-09 19:08:29 +0000 +++ src/puresize.h 2011-11-10 08:14:27 +0000 @@ -75,21 +75,7 @@ /* Define PURE_P. */ -#ifdef VIRT_ADDR_VARIES -/* For machines where text and data can go anywhere - in virtual memory. */ - extern EMACS_INT pure[]; #define PURE_P(obj) \ - ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) ((char *) pure + PURESIZE) \ - && (PNTR_COMPARISON_TYPE) XPNTR (obj) >= (PNTR_COMPARISON_TYPE) pure) - -#else /* not VIRT_ADDR_VARIES */ - -extern char my_edata[]; - -#define PURE_P(obj) \ - ((PNTR_COMPARISON_TYPE) XPNTR (obj) < (PNTR_COMPARISON_TYPE) my_edata) - -#endif /* VIRT_ADDRESS_VARIES */ + ((uintptr_t) XPNTR (obj) - (uintptr_t) pure <= PURESIZE) === modified file 'src/s/cygwin.h' --- src/s/cygwin.h 2011-03-17 05:15:08 +0000 +++ src/s/cygwin.h 2011-11-10 08:14:27 +0000 @@ -91,9 +91,6 @@ why it needed to be changed. */ #define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS -/* Virtual addresses of pure and impure space can vary, as on Windows. */ -#define VIRT_ADDR_VARIES - /* Emacs supplies its own malloc, but glib (part of Gtk+) calls memalign and on Cygwin, that becomes the Cygwin-supplied memalign. As malloc is not the Cygwin malloc, the Cygwin memalign always === modified file 'src/s/hpux10-20.h' --- src/s/hpux10-20.h 2011-11-11 23:17:16 +0000 +++ src/s/hpux10-20.h 2011-11-14 04:35:22 +0000 @@ -100,14 +100,6 @@ header sections which lose when `static' is defined away, as it is on HP-UX. (You get duplicate symbol errors on linking). */ #undef _FILE_OFFSET_BITS - -/* Define VIRT_ADDR_VARIES if the virtual addresses of - pure and impure space as loaded can vary, and even their - relative order cannot be relied on. - - Otherwise Emacs assumes that text space precedes data space, - numerically. */ -#define VIRT_ADDR_VARIES /* The data segment on this machine always starts at address 0x40000000. */ #define DATA_SEG_BITS 0x40000000