Author: Armin Rigo <ar...@tunes.org>
Branch: reverse-debugger
Changeset: r86166:4a605deff6e0
Date: 2016-08-12 11:02 +0200
http://bitbucket.org/pypy/pypy/changeset/4a605deff6e0/

Log:    Update printed text

diff --git a/rpython/translator/revdb/src-revdb/revdb.c 
b/rpython/translator/revdb/src-revdb/revdb.c
--- a/rpython/translator/revdb/src-revdb/revdb.c
+++ b/rpython/translator/revdb/src-revdb/revdb.c
@@ -978,12 +978,18 @@
         fprintf(stderr,
                 "\n"
                 "In the replaying process, the addresses are different than\n"
-                "in the recording process.  We don't support this case for\n"
-                "now, sorry.  On Linux, check if Address Space Layout\n"
-                "Randomization (ASLR) is enabled, and disable it with:\n"
+                "in the recording process.  Make sure that the executable\n"
+                "\n"
+                "    %s\n"
+                "\n"
+                "is the same one as the one that was used during recording.\n"
+                "If it is, then you may be hitting an issue with Address\n"
+                "Space Layout Randomization.  On Linux, ASLR should be\n"
+                "automatically disabled, but just in case, the following\n"
+                "command disables it manually:\n"
                 "\n"
                 "    echo 0 | sudo tee /proc/sys/kernel/randomize_va_space\n"
-                "\n");
+                "\n", argv[0]);
         exit(1);
     }
     *argc_p = h.argc;
@@ -1129,7 +1135,7 @@
         fprintf(stderr, "%s:%d: Attempted to do I/O or access raw memory\n",
                 file, line);
         if (flag_io_disabled != FID_POTENTIAL_IO) {
-            fprintf(stderr, "but we are not in a jmpbuf_protected section\n");
+            fprintf(stderr, "but we are not in a protected section\n");
             exit(1);
         }
         write_answer(ANSWER_ATTEMPT_IO, 0, 0, 0);
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to