Update hashes

diff --git a/src/dmpstruct.awk b/src/dmpstruct.awk
index 0a22030405d4bd0d892f72f6b02af22a10b9f7c2..d222d117e626f0cb8a1c9f2a46f93c499241eb29 100755 (executable)
--- a/src/dmpstruct.awk
+++ b/src/dmpstruct.awk
@@ -13,7 +13,7 @@ BEGIN {
 /^(enum|struct|union) [a-zA-Z0-9_]+([\t ]|\/\*.*\*\/)*$/, /^(  )?};$/ {
   print $0 > tmpfile
 }
-/^(  )?};$/ {
+/^(  )?} *(GCALIGNED_STRUCT)? *;$/ {
   if (struct_name != "") {
     fflush (tmpfile)
     cmd = "../lib-src/make-fingerprint -r " tmpfile

diff --git a/src/pdumper.c b/src/pdumper.c
index 2908ffd12a9cd1628ba3ecc5ea3ab83960323bf8..f6561249d8c775e4ae8b0e4a22e633eb9a82a2c7 100644 (file)
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -56,7 +56,7 @@
    still valid and update the hash from the dmpstruct.h generated by
    your new code.  */
 #ifndef CHECK_STRUCTS
-# define CHECK_STRUCTS 0 // XXX
+# define CHECK_STRUCTS 1
 #endif
 
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
@@ -676,14 +676,15 @@ emacs_basis (void)
 static void *
 emacs_ptr (const ptrdiff_t offset)
 {
-  // TODO: assert somehow that OFFSET is actually inside Emacs
+  /* TODO: assert somehow that the result is actually in the Emacs
+     image.  */
   return (void *) (emacs_basis () + offset);
 }
 
 static dump_off
 emacs_offset (const void *emacs_ptr)
 {
-  /* TODO: assert that EMACS_PTR is actually in emacs */
+  /* TODO: assert that EMACS_PTR is actually in the Emacs image.  */
   eassert (emacs_ptr != NULL);
   intptr_t emacs_ptr_value = (intptr_t) emacs_ptr;
   ptrdiff_t emacs_ptr_relative = emacs_ptr_value - (intptr_t) emacs_basis ();
@@ -998,8 +999,8 @@ dump_queue_enqueue (struct dump_queue *dump_queue,
 {
   Lisp_Object weights = Fgethash (object, dump_queue->link_weights, Qnil);
   Lisp_Object orig_weights = weights;
-  // N.B. want to find the last item of a given weight in each queue
-  // due to prepend use.
+  /* N.B. want to find the last item of a given weight in each queue
+     due to prepend use.  */
   bool use_single_queues = true;
   if (NILP (weights))
     {
@@ -2011,7 +2012,7 @@ dump_pseudovector_lisp_fields (
 static dump_off
 dump_cons (struct dump_context *ctx, const struct Lisp_Cons *cons)
 {
-#if CHECK_STRUCTS && !defined (HASH_Lisp_Cons_F25EE3E42E)
+#if CHECK_STRUCTS && !defined (HASH_Lisp_Cons_00EEE63F67)
 # error "Lisp_Cons changed. See CHECK_STRUCTS comment."
 #endif
   struct Lisp_Cons out;
@@ -2072,7 +2073,7 @@ dump_interval_tree (struct dump_context *ctx,
 static dump_off
 dump_string (struct dump_context *ctx, const struct Lisp_String *string)
 {
-#if CHECK_STRUCTS && !defined (HASH_Lisp_Symbol_EB06C0D9EA)
+#if CHECK_STRUCTS && !defined (HASH_Lisp_Symbol_60EA1E748E)
 # error "Lisp_String changed. See CHECK_STRUCTS comment."
 #endif
   /* If we have text properties, write them _after_ the string so that
@@ -2118,7 +2119,7 @@ dump_string (struct dump_context *ctx, const struct Lisp_String *string)
 static dump_off
 dump_marker (struct dump_context *ctx, const struct Lisp_Marker *marker)
 {
-#if CHECK_STRUCTS && !defined (HASH_Lisp_Marker_3C824B47DB)
+#if CHECK_STRUCTS && !defined (HASH_Lisp_Marker_642DBAF866)
 # error "Lisp_Marker changed. See CHECK_STRUCTS comment."
 #endif
   struct Lisp_Marker out;
@@ -2149,7 +2150,7 @@ dump_marker (struct dump_context *ctx, const struct Lisp_Marker *marker)
 static dump_off
 dump_overlay (struct dump_context *ctx, const struct Lisp_Overlay *overlay)
 {
-#if CHECK_STRUCTS && !defined (HASH_Lisp_Overlay_CD6BBB22F3)
+#if CHECK_STRUCTS && !defined (HASH_Lisp_Overlay_72EADA9882)
 # error "Lisp_Overlay changed. See CHECK_STRUCTS comment."
 #endif
   struct Lisp_Overlay out;
@@ -2180,7 +2181,7 @@ static dump_off
 dump_finalizer (struct dump_context *ctx,
                 const struct Lisp_Finalizer *finalizer)
 {
-#if CHECK_STRUCTS && !defined (HASH_Lisp_Finalizer_514A6407BC)
+#if CHECK_STRUCTS && !defined (HASH_Lisp_Finalizer_D58E647CB8)
 # error "Lisp_Finalizer changed. See CHECK_STRUCTS comment."
 #endif
   struct Lisp_Finalizer out;
@@ -2198,7 +2199,7 @@ dump_finalizer (struct dump_context *ctx,
 static dump_off
 dump_float (struct dump_context *ctx, const struct Lisp_Float *lfloat)
 {
-#if CHECK_STRUCTS && !defined (HASH_Lisp_Float_938B4A25C3)
+#if CHECK_STRUCTS && !defined (HASH_Lisp_Float_50A7B216D9)
 # error "Lisp_Float changed. See CHECK_STRUCTS comment."
 #endif
   eassert (ctx->header.cold_start);
@@ -2257,7 +2258,7 @@ static dump_off
 dump_fwd_buffer_obj (struct dump_context *ctx,
                      const struct Lisp_Buffer_Objfwd *buffer_objfwd)
 {
-#if CHECK_STRUCTS && !defined (HASH_Lisp_Buffer_Objfwd_611EBD13FF)
+#if CHECK_STRUCTS && !defined (HASH_Lisp_Buffer_Objfwd_13CA6B04FC)
 # error "Lisp_Buffer_Objfwd changed. See CHECK_STRUCTS comment."
 #endif
   struct Lisp_Buffer_Objfwd out;
@@ -2322,7 +2323,7 @@ static dump_off
 dump_blv (struct dump_context *ctx,
           const struct Lisp_Buffer_Local_Value *blv)
 {
-#if CHECK_STRUCTS && !defined (HASH_Lisp_Buffer_Local_Value_2B3BD67753)
+#if CHECK_STRUCTS && !defined (HASH_Lisp_Buffer_Local_Value_066F33A92E)
 # error "Lisp_Buffer_Local_Value changed. See CHECK_STRUCTS comment."
 #endif
   struct Lisp_Buffer_Local_Value out;
@@ -2394,7 +2395,7 @@ dump_symbol (struct dump_context *ctx,
              Lisp_Object object,
              dump_off offset)
 {
-#if CHECK_STRUCTS && !defined (HASH_Lisp_Symbol_EB06C0D9EA)
+#if CHECK_STRUCTS && !defined (HASH_Lisp_Symbol_60EA1E748E)
 # error "Lisp_Symbol changed. See CHECK_STRUCTS comment."
 #endif
 #if CHECK_STRUCTS && !defined (HASH_symbol_redirect_ADB4F5B113)
@@ -2491,7 +2492,7 @@ dump_vectorlike_generic (
   struct dump_context *ctx,
   const union vectorlike_header *header)
 {
-#if CHECK_STRUCTS && !defined (HASH_vectorlike_header_8409709BAF)
+#if CHECK_STRUCTS && !defined (HASH_vectorlike_header_00A5A4BFB2)
 # error "vectorlike_header changed. See CHECK_STRUCTS comment."
 #endif
   const struct Lisp_Vector *v = (const struct Lisp_Vector *) header;
@@ -2642,7 +2643,7 @@ dump_hash_table (struct dump_context *ctx,
                  Lisp_Object object,
                  dump_off offset)
 {
-#if CHECK_STRUCTS && !defined (HASH_Lisp_Hash_Table_400EA529E0)
+#if CHECK_STRUCTS && !defined (HASH_Lisp_Hash_Table_73C9BFB7D1)
 # error "Lisp_Hash_Table changed. See CHECK_STRUCTS comment."
 #endif
   const struct Lisp_Hash_Table *hash_in = XHASH_TABLE (object);
@@ -2851,7 +2852,7 @@ dump_buffer (struct dump_context *ctx, const struct buffer *in_buffer)
 static dump_off
 dump_bool_vector (struct dump_context *ctx, const struct Lisp_Vector *v)
 {
-#if CHECK_STRUCTS && !defined (HASH_Lisp_Vector_2FA5E2F339)
+#if CHECK_STRUCTS && !defined (HASH_Lisp_Vector_3091289B35)
 # error "Lisp_Vector changed. See CHECK_STRUCTS comment."
 #endif
   /* No relocation needed, so we don't need dump_object_start.  */
@@ -2868,7 +2869,7 @@ dump_bool_vector (struct dump_context *ctx, const struct Lisp_Vector *v)
 static dump_off
 dump_subr (struct dump_context *ctx, const struct Lisp_Subr *subr)
 {
-#if CHECK_STRUCTS && !defined (HASH_Lisp_Subr_B0DEEE4344)
+#if CHECK_STRUCTS && !defined (HASH_Lisp_Subr_594AB72B54)
 # error "Lisp_Subr changed. See CHECK_STRUCTS comment."
 #endif
   struct Lisp_Subr out;
@@ -2917,7 +2918,7 @@ dump_vectorlike (struct dump_context *ctx,
                  Lisp_Object lv,
                  dump_off offset)
 {
-#if CHECK_STRUCTS && !defined (HASH_pvec_type_69A8BF53D8)
+#if CHECK_STRUCTS && !defined (HASH_pvec_type_549C833A54)
 # error "pvec_type changed. See CHECK_STRUCTS comment."
 #endif
   const struct Lisp_Vector *v = XVECTOR (lv);
@@ -3026,7 +3027,7 @@ dump_vectorlike (struct dump_context *ctx,
 static dump_off
 dump_object (struct dump_context *ctx, Lisp_Object object)
 {
-#if CHECK_STRUCTS && !defined (HASH_Lisp_Type_C9E246F617)
+#if CHECK_STRUCTS && !defined (HASH_Lisp_Type_E2AD97D3F7)
 # error "Lisp_Type changed. See CHECK_STRUCTS comment."
 #endif
 #ifdef ENABLE_CHECKING