From: Helmut Eller <eller.helmut@gmail.com>
To: Andrea Corallo <acorallo@gnu.org>
Cc: "Gerd Möllmann" <gerd.moellmann@gmail.com>, emacs-devel@gnu.org
Subject: Re: scratch/igc lread testsuite error [was Re: scratch/igc warning]
Date: Thu, 27 Jun 2024 09:01:47 +0200 [thread overview]
Message-ID: <877cea98dg.fsf@gmail.com> (raw)
In-Reply-To: <yp1ikxvn01e.fsf_-_@fencepost.gnu.org> (Andrea Corallo's message of "Wed, 26 Jun 2024 12:25:49 -0400")
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
On Wed, Jun 26 2024, Andrea Corallo wrote:
> I can bootstrap fine scratch/igc with nativecomp, and make check shows
> here only one fail, 'lread-circle' in src/lread-tests.log.
This should be fixed by:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Small-fixes-for-dumper.patch --]
[-- Type: text/x-diff, Size: 1436 bytes --]
From d68b4c832268ef2fe478ae9f77b3286406a4cdaa Mon Sep 17 00:00:00 2001
From: Helmut Eller <eller.helmut@gmail.com>
Date: Thu, 27 Jun 2024 08:38:56 +0200
Subject: [PATCH 1/2] Small fixes for dumper
* src/pdumper.c (dump_subr): Use dump_field_lv for command_modes.
(dump_igc_start_obj): DUMP_ALIGNMENT seems more appropriate than
igc_header_size.
---
src/pdumper.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/pdumper.c b/src/pdumper.c
index 667f75ef6bf..4dfe38d0d8c 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -903,7 +903,7 @@ dump_igc_start_obj (struct dump_context *ctx, enum igc_obj_type type,
{
eassert (ctx->igc_type == IGC_OBJ_INVALID);
eassert (ctx->igc_obj_dumped == NULL);
- eassert (ctx->offset % igc_header_size () == 0);
+ eassert (ctx->offset % DUMP_ALIGNMENT == 0);
ctx->igc_obj_dumped = (void *) in;
ctx->igc_type = type;
ctx->igc_base_offset = ctx->offset;
@@ -3033,7 +3033,8 @@ dump_subr (struct dump_context *ctx, const struct Lisp_Subr *subr)
{
dump_field_emacs_ptr (ctx, &out, subr, &subr->symbol_name);
dump_field_emacs_ptr (ctx, &out, subr, &subr->intspec.string);
- dump_field_emacs_ptr (ctx, &out, subr, &subr->command_modes);
+ eassert (NILP (subr->command_modes));
+ dump_field_lv (ctx, &out, subr, &subr->command_modes, WEIGHT_NORMAL);
}
DUMP_FIELD_COPY (&out, subr, doc);
#ifdef HAVE_NATIVE_COMP
--
2.39.2
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-Fix-lread-tests.patch --]
[-- Type: text/x-diff, Size: 1178 bytes --]
From 43d5bbe504f2ae86e206ced42bb7b2bbf104e29f Mon Sep 17 00:00:00 2001
From: Helmut Eller <eller.helmut@gmail.com>
Date: Thu, 27 Jun 2024 08:55:30 +0200
Subject: [PATCH 2/2] Fix lread-tests
* src/print.c (pp_stack_pop): Pop values from left to right.
---
src/print.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/print.c b/src/print.c
index d2b4a586e6c..146cd7bd8c6 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1402,8 +1402,9 @@ pp_stack_push_values (Lisp_Object vectorlike, ptrdiff_t start, ptrdiff_t n)
return;
if (ppstack.sp >= ppstack.size)
grow_pp_stack ();
- ppstack.stack[ppstack.sp++]
- = (struct print_pp_entry){ .start = start, .n = n, .u.vectorlike = vectorlike };
+ ppstack.stack[ppstack.sp++] = (struct print_pp_entry){
+ .start = start, .n = n, .u.vectorlike = vectorlike
+ };
ppstack.stack[ppstack.sp - 1].is_free = false;
}
#else
@@ -1444,7 +1445,8 @@ pp_stack_pop (void)
e->n--;
Lisp_Object result;
#ifdef HAVE_MPS
- result = AREF (e->u.vectorlike, e->start + e->n);
+ result = AREF (e->u.vectorlike, e->start);
+ e->start++;
#else
result = (++e->u.values)[-1];
#endif
--
2.39.2
next prev parent reply other threads:[~2024-06-27 7:01 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-26 14:08 scratch/igc warning Andrea Corallo
2024-06-26 14:31 ` Pip Cet
2024-06-26 14:43 ` Andrea Corallo
2024-06-26 15:45 ` Pip Cet
2024-06-26 14:39 ` Gerd Möllmann
2024-06-26 14:48 ` Andrea Corallo
2024-06-26 14:57 ` Gerd Möllmann
2024-06-26 16:25 ` scratch/igc lread testsuite error [was Re: scratch/igc warning] Andrea Corallo
2024-06-26 16:35 ` Gerd Möllmann
2024-06-27 7:01 ` Helmut Eller [this message]
2024-06-27 7:09 ` Gerd Möllmann
2024-06-27 12:09 ` Andrea Corallo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877cea98dg.fsf@gmail.com \
--to=eller.helmut@gmail.com \
--cc=acorallo@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=gerd.moellmann@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.