CVS commit: src/sys/arch/alpha
Module Name:src Committed By: thorpej Date: Sun Jul 11 01:58:41 UTC 2021 Modified Files: src/sys/arch/alpha/alpha: genassym.cf lock_stubs.s machdep.c src/sys/arch/alpha/include: rwlock.h Log Message: Optimized fast-paths for rw_enter() / rw_tryenter() / rw_exit(). To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/alpha/alpha/genassym.cf cvs rdiff -u -r1.4 -r1.5 src/sys/arch/alpha/alpha/lock_stubs.s cvs rdiff -u -r1.373 -r1.374 src/sys/arch/alpha/alpha/machdep.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/alpha/include/rwlock.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/alpha/genassym.cf diff -u src/sys/arch/alpha/alpha/genassym.cf:1.28 src/sys/arch/alpha/alpha/genassym.cf:1.29 --- src/sys/arch/alpha/alpha/genassym.cf:1.28 Sun Jul 11 01:54:42 2021 +++ src/sys/arch/alpha/alpha/genassym.cf Sun Jul 11 01:58:41 2021 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.28 2021/07/11 01:54:42 thorpej Exp $ +# $NetBSD: genassym.cf,v 1.29 2021/07/11 01:58:41 thorpej Exp $ # # Copyright (c) 1982, 1990, 1993 @@ -66,12 +66,15 @@ # from: @(#)genassym.c 8.3 (Berkeley) 1/4/94 # +quote #define __RWLOCK_PRIVATE + include include include include include include +include include include @@ -196,3 +199,9 @@ define CPU_INFO_IDLE_LWP offsetof(struct define CPU_INFO_SSIR offsetof(struct cpu_info, ci_ssir) define CPU_INFO_MTX_COUNT offsetof(struct cpu_info, ci_mtx_count) define CPU_INFO_SIZEOF sizeof(struct cpu_info) + +# Bits in lock fields +define RW_WRITE_WANTED RW_WRITE_WANTED +define RW_WRITE_LOCKED RW_WRITE_LOCKED +define RW_READ_INCR RW_READ_INCR +define RW_READ_COUNT_SHIFT RW_READ_COUNT_SHIFT Index: src/sys/arch/alpha/alpha/lock_stubs.s diff -u src/sys/arch/alpha/alpha/lock_stubs.s:1.4 src/sys/arch/alpha/alpha/lock_stubs.s:1.5 --- src/sys/arch/alpha/alpha/lock_stubs.s:1.4 Fri Sep 4 02:54:56 2020 +++ src/sys/arch/alpha/alpha/lock_stubs.s Sun Jul 11 01:58:41 2021 @@ -1,11 +1,11 @@ -/* $NetBSD: lock_stubs.s,v 1.4 2020/09/04 02:54:56 thorpej Exp $ */ +/* $NetBSD: lock_stubs.s,v 1.5 2021/07/11 01:58:41 thorpej Exp $ */ /*- - * Copyright (c) 2007 The NetBSD Foundation, Inc. + * Copyright (c) 2007, 2021 The NetBSD Foundation, Inc. * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation - * by Andrew Doran. + * by Andrew Doran, and by Jason R. Thorpe. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -34,7 +34,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: lock_stubs.s,v 1.4 2020/09/04 02:54:56 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: lock_stubs.s,v 1.5 2021/07/11 01:58:41 thorpej Exp $"); #include "assym.h" @@ -63,7 +63,7 @@ LEAF(_lock_cas, 3) RET 3: br 1b -END(_lock_cas) + END(_lock_cas) #if !defined(LOCKDEBUG) @@ -72,7 +72,7 @@ END(_lock_cas) */ LEAF(mutex_enter, 1) LDGP(pv) - GET_CURLWP + GET_CURLWP /* Note: GET_CURLWP clobbers v0, t0, t8...t11. */ 1: mov v0, t1 ldq_l t2, 0(a0) @@ -86,7 +86,7 @@ LEAF(mutex_enter, 1) jmp (t12) 3: br 1b -END(mutex_enter) + END(mutex_enter) /* * void mutex_exit(kmutex_t *mtx); @@ -94,7 +94,7 @@ END(mutex_enter) LEAF(mutex_exit, 1) LDGP(pv) MB - GET_CURLWP + GET_CURLWP /* Note: GET_CURLWP clobbers v0, t0, t8...t11. */ mov zero, t3 1: ldq_l t2, 0(a0) @@ -108,6 +108,162 @@ LEAF(mutex_exit, 1) jmp (t12) 3: br 1b -END(mutex_exit) + END(mutex_exit) + +/* + * void rw_enter(krwlock_t *rwl, krw_t op); + * + * Acquire one hold on a RW lock. + */ +LEAF(rw_enter, 2) + LDGP(pv) + + /* + * RW_READER == 0 (we have a compile-time assert in machdep.c + * to ensure this). + * + * Acquire for read is the most common case. + */ + bne a1, 3f + + /* Acquiring for read. */ +1: ldq_l t0, 0(a0) + and t0, (RW_WRITE_LOCKED|RW_WRITE_WANTED), t1 + addq t0, RW_READ_INCR, t2 + bne t1, 4f /* contended */ + stq_c t2, 0(a0) + beq t2, 2f /* STQ_C failed; retry */ + MB + RET + +2: br 1b + +3: /* Acquiring for write. */ + GET_CURLWP /* Note: GET_CURLWP clobbers v0, t0, t8...t11. */ + ldq_l t0, 0(a0) + or v0, RW_WRITE_LOCKED, t2 + bne t0, 4f /* contended */ + stq_c t2, 0(a0) + beq t2, 4f /* STQ_C failed; consider it contended */ + MB + RET + +4: lda pv, rw_vector_enter + jmp (pv) + END(rw_enter) + +/* + * int rw_tryenter(krwlock_t *rwl, krw_t op); + * + * Try to acquire one hold on a RW lock. + */ +LEAF(rw_tryenter, 2) + LDGP(pv) + + /* See above. */ + bne a1, 3f + + /* Acquiring for read. */ +1: ldq_l t0, 0(a0) + and t0, (RW_WRITE_LOCKED|RW_WRITE_WANTED), t1 + addq t0, RW_READ_INCR, v0 + bne t1, 4f /* contended */ + stq_c v0, 0(a0) + beq v0, 2f /* STQ_C failed; retry */ + MB + RET /* v0 contains non-zero LOCK_FLAG from STQ_C */ + +2: br 1b + + /* Acquiring for write. */ +3: GET_CURLWP /* Note: GET_CURLWP clobbers v0, t0,
CVS commit: src/sys/arch/alpha/alpha
Module Name:src Committed By: thorpej Date: Sun Jul 11 01:55:51 UTC 2021 Modified Files: src/sys/arch/alpha/alpha: locore.s Log Message: Pull in pmap_subr.s (missed in prior commit). To generate a diff of this commit: cvs rdiff -u -r1.139 -r1.140 src/sys/arch/alpha/alpha/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/alpha/locore.s diff -u src/sys/arch/alpha/alpha/locore.s:1.139 src/sys/arch/alpha/alpha/locore.s:1.140 --- src/sys/arch/alpha/alpha/locore.s:1.139 Wed Jul 7 03:30:35 2021 +++ src/sys/arch/alpha/alpha/locore.s Sun Jul 11 01:55:51 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.139 2021/07/07 03:30:35 thorpej Exp $ */ +/* $NetBSD: locore.s,v 1.140 2021/07/11 01:55:51 thorpej Exp $ */ /*- * Copyright (c) 1999, 2000, 2019 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.139 2021/07/07 03:30:35 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.140 2021/07/11 01:55:51 thorpej Exp $"); #include "assym.h" @@ -217,6 +217,15 @@ NESTED_NOPROFILE(locorestart,1,0,ra,0,0) /**/ +/* + * Pull in optimized pmap subroutines. + */ +#include + +/**/ + +/**/ + .text .stabs __FILE__,132,0,0,backtolocore1 /* done with includes */ .loc 1 __LINE__
CVS commit: src/sys/arch/alpha/alpha
Module Name:src Committed By: thorpej Date: Sun Jul 11 01:54:42 UTC 2021 Modified Files: src/sys/arch/alpha/alpha: genassym.cf Log Message: Define ALPHA_PGBYTES (missed in prior commit). To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/alpha/alpha/genassym.cf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/alpha/alpha/genassym.cf diff -u src/sys/arch/alpha/alpha/genassym.cf:1.27 src/sys/arch/alpha/alpha/genassym.cf:1.28 --- src/sys/arch/alpha/alpha/genassym.cf:1.27 Sat Sep 19 01:24:31 2020 +++ src/sys/arch/alpha/alpha/genassym.cf Sun Jul 11 01:54:42 2021 @@ -1,4 +1,4 @@ -# $NetBSD: genassym.cf,v 1.27 2020/09/19 01:24:31 thorpej Exp $ +# $NetBSD: genassym.cf,v 1.28 2021/07/11 01:54:42 thorpej Exp $ # # Copyright (c) 1982, 1990, 1993 @@ -84,6 +84,7 @@ include # general constants define VM_MAX_ADDRESS VM_MAX_ADDRESS +define ALPHA_PGBYTES ALPHA_PGBYTES # Register offsets, for stack frames. define FRAME_V0 FRAME_V0
CVS commit: xsrc/external/mit/MesaLib7/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 11 01:14:05 UTC 2021 Removed Files: xsrc/external/mit/MesaLib7/dist/include/GL: gl.h gl_mangle.h glext.h glfbdev.h glu.h glu_mangle.h glx.h glx_mangle.h glxext.h mesa_wgl.h osmesa.h vms_x_fix.h wglext.h wmesa.h xsrc/external/mit/MesaLib7/dist/include/GL/internal: dri_interface.h sarea.h xsrc/external/mit/MesaLib7/dist/include/GLES: egl.h gl.h glext.h glplatform.h xsrc/external/mit/MesaLib7/dist/include/GLES2: gl2.h gl2ext.h gl2platform.h xsrc/external/mit/MesaLib7/dist/include/KHR: khrplatform.h xsrc/external/mit/MesaLib7/dist/include/c99: inttypes.h stdbool.h stdint.h xsrc/external/mit/MesaLib7/dist/include/pci_ids: i810_pci_ids.h i915_pci_ids.h i965_pci_ids.h pci_id_driver_map.h r200_pci_ids.h r300_pci_ids.h r600_pci_ids.h radeon_pci_ids.h xsrc/external/mit/MesaLib7/dist/src/gallium/auxiliary/util: dbghelp.h u_atomic.h u_bitmask.c u_bitmask.h u_blit.c u_blit.h u_blitter.c u_blitter.h u_box.h u_cache.c u_cache.h u_caps.c u_caps.h u_clear.h u_cpu_detect.c u_cpu_detect.h u_debug.c u_debug.h u_debug_describe.c u_debug_describe.h u_debug_memory.c u_debug_refcnt.c u_debug_refcnt.h u_debug_stack.c u_debug_stack.h u_debug_symbol.c u_debug_symbol.h u_dirty_flags.h u_dirty_surfaces.h u_dl.c u_dl.h u_double_list.h u_draw.c u_draw.h u_draw_quad.c u_draw_quad.h u_dump.h u_dump_defines.c u_dump_state.c u_dynarray.h u_fifo.h u_format.c u_format.csv u_format.h u_format_latc.c u_format_latc.h u_format_other.c u_format_other.h u_format_pack.py u_format_parse.py u_format_r11g11b10f.h u_format_rgb9e5.h u_format_rgtc.c u_format_rgtc.h u_format_s3tc.c u_format_s3tc.h u_format_srgb.h u_format_srgb.py u_format_table.py u_format_tests.c u_format_tests.h u_format_yuv.c u_format_yuv.h u_format_zs.c u_format_zs.h u_framebuffer.c u_framebuffer.h u_gen_mipmap.c u_gen_mipmap.h u_half.h u_half.py u_handle_table.c u_handle_table.h u_hash.c u_hash.h u_hash_table.c u_hash_table.h u_index_modify.c u_index_modify.h u_init.h u_inlines.h u_keymap.c u_keymap.h u_linear.c u_linear.h u_linkage.c u_linkage.h u_math.c u_math.h u_memory.h u_mm.c u_mm.h u_network.c u_network.h u_pack_color.h u_pointer.h u_prim.h u_pstipple.c u_pstipple.h u_rect.c u_rect.h u_resource.c u_ringbuffer.c u_ringbuffer.h u_sampler.c u_sampler.h u_simple_list.h u_simple_screen.h u_simple_shaders.c u_simple_shaders.h u_slab.c u_slab.h u_snprintf.c u_split_prim.h u_sse.h u_staging.c u_staging.h u_string.h u_surface.c u_surface.h u_surfaces.c u_surfaces.h u_texture.c u_texture.h u_tile.c u_tile.h u_time.h u_transfer.c u_transfer.h u_upload_mgr.c u_upload_mgr.h u_vbuf_mgr.c u_vbuf_mgr.h xsrc/external/mit/MesaLib7/dist/src/glsl: Makefile Makefile.template README SConscript ast.h ast_expr.cpp ast_function.cpp ast_to_hir.cpp ast_type.cpp builtin_function.cpp builtin_stubs.cpp builtin_types.h builtin_variables.h glsl_lexer.cpp glsl_lexer.ll glsl_parser.cpp glsl_parser.h glsl_parser.yy glsl_parser_extras.cpp glsl_parser_extras.h glsl_symbol_table.cpp glsl_symbol_table.h glsl_types.cpp glsl_types.h hir_field_selection.cpp ir.cpp ir.h ir_basic_block.cpp ir_basic_block.h ir_clone.cpp ir_constant_expression.cpp ir_expression_flattening.cpp ir_expression_flattening.h ir_function.cpp ir_function_can_inline.cpp ir_function_detect_recursion.cpp ir_function_inlining.h ir_hierarchical_visitor.cpp ir_hierarchical_visitor.h ir_hv_accept.cpp ir_import_prototypes.cpp ir_optimization.h ir_print_visitor.cpp ir_print_visitor.h ir_reader.cpp ir_reader.h ir_rvalue_visitor.cpp ir_rvalue_visitor.h ir_set_program_inouts.cpp ir_validate.cpp ir_variable.cpp ir_variable_refcount.cpp ir_variable_refcount.h ir_visitor.h link_functions.cpp linker.cpp linker.h list.h loop_analysis.cpp loop_analysis.h loop_controls.cpp loop_unroll.cpp lower_discard.cpp lower_if_to_cond_assign.cpp lower_instructions.cpp lower_jumps.cpp lower_mat_op_to_vec.cpp lower_noise.cpp lower_texture_projection.cpp lower_variable_index_to_cond_assign.cpp lower_vec_index_to_cond_assign.cpp lower_vec_index_to_swizzle.cpp lower_vector.cpp main.cpp opt_algebraic.cpp opt_constant_folding.cpp opt_constant_propagation.cpp opt_constant_variable.cpp
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: mrg
Date: Sun Jul 11 01:13:27 UTC 2021
Modified Files:
src/external/mit/xorg/lib: Makefile mesa-which.mk
Removed Files:
src/external/mit/xorg/lib/dri7: Makefile dri.mk libglsl7.mk libmesa7.mk
src/external/mit/xorg/lib/dri7/libmesa: Makefile
src/external/mit/xorg/lib/dri7/r300: Makefile
Log Message:
remove dead mesa7 support.
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/mesa-which.mk
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/dri7/Makefile \
src/external/mit/xorg/lib/dri7/dri.mk \
src/external/mit/xorg/lib/dri7/libmesa7.mk
cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/lib/dri7/libglsl7.mk
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/dri7/libmesa/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/lib/dri7/r300/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.54 src/external/mit/xorg/lib/Makefile:1.55
--- src/external/mit/xorg/lib/Makefile:1.54 Wed Oct 28 08:10:10 2020
+++ src/external/mit/xorg/lib/Makefile Sun Jul 11 01:13:26 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2020/10/28 08:10:10 nia Exp $
+# $NetBSD: Makefile,v 1.55 2021/07/11 01:13:26 mrg Exp $
# build libraries for xorg
@@ -23,7 +23,7 @@ SUBDIR+=libxcb \
libX11 \
.WAIT
.if !defined(MLIBDIR)
-SUBDIR+=${EXTRA_DRI_DIRS} dri${OLD_PREFIX} gallium${OLD_PREFIX}
+SUBDIR+=dri${OLD_PREFIX} gallium${OLD_PREFIX}
.endif
SUBDIR+=fontconfig libSM \
.WAIT \
Index: src/external/mit/xorg/lib/mesa-which.mk
diff -u src/external/mit/xorg/lib/mesa-which.mk:1.1 src/external/mit/xorg/lib/mesa-which.mk:1.2
--- src/external/mit/xorg/lib/mesa-which.mk:1.1 Sun Mar 10 02:29:52 2019
+++ src/external/mit/xorg/lib/mesa-which.mk Sun Jul 11 01:13:26 2021
@@ -1,7 +1,6 @@
-# $NetBSD: mesa-which.mk,v 1.1 2019/03/10 02:29:52 mrg Exp $
+# $NetBSD: mesa-which.mk,v 1.2 2021/07/11 01:13:26 mrg Exp $
OLD_PREFIX=
.if ${EXTERNAL_MESALIB_DIR} == "MesaLib.old"
OLD_PREFIX=.old
-EXTRA_DRI_DIRS=dri7
.endif
CVS commit: src/external/mit/xorg/lib/libdrm
Module Name:src
Committed By: mrg
Date: Sun Jul 11 00:43:40 UTC 2021
Modified Files:
src/external/mit/xorg/lib/libdrm: Makefile
Log Message:
also look in dist/../include.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/lib/libdrm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.17 src/external/mit/xorg/lib/libdrm/Makefile:1.18
--- src/external/mit/xorg/lib/libdrm/Makefile:1.17 Mon Aug 12 14:21:54 2019
+++ src/external/mit/xorg/lib/libdrm/Makefile Sun Jul 11 00:43:40 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/08/12 14:21:54 maya Exp $
+# $NetBSD: Makefile,v 1.18 2021/07/11 00:43:40 mrg Exp $
.include
@@ -10,7 +10,7 @@ SRCS= xf86drm.c xf86drmHash.c xf86drmMod
INCS= xf86drm.h xf86drmMode.h libsync.h
INCSDIR=${X11INCDIR}
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm -I${X11SRCDIR.${LIB}}/../include
SUBDIR= drm kms
CVS commit: xsrc/external/mit/libdrm
Module Name:xsrc
Committed By: mrg
Date: Sun Jul 11 00:41:13 UTC 2021
Modified Files:
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu_vamgr.c
Added Files:
xsrc/external/mit/libdrm/include: generated_static_table_fourcc.h
Log Message:
avoid 'visibility' attribute on static functions.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c
cvs rdiff -u -r0 -r1.1 \
xsrc/external/mit/libdrm/include/generated_static_table_fourcc.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c
diff -u xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c:1.3 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c:1.4
--- xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c:1.3 Sun Jul 11 00:31:54 2021
+++ xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c Sun Jul 11 00:41:13 2021
@@ -69,7 +69,7 @@ drm_private void amdgpu_vamgr_deinit(str
pthread_mutex_destroy(>bo_va_mutex);
}
-static drm_private int
+static int
amdgpu_vamgr_subtract_hole(struct amdgpu_bo_va_hole *hole, uint64_t start_va,
uint64_t end_va)
{
@@ -97,7 +97,7 @@ amdgpu_vamgr_subtract_hole(struct amdgpu
return 0;
}
-static drm_private int
+static int
amdgpu_vamgr_find_va(struct amdgpu_bo_va_mgr *mgr, uint64_t size,
uint64_t alignment, uint64_t base_required,
bool search_from_top, uint64_t *va_out)
Added files:
Index: xsrc/external/mit/libdrm/include/generated_static_table_fourcc.h
diff -u /dev/null xsrc/external/mit/libdrm/include/generated_static_table_fourcc.h:1.1
--- /dev/null Sun Jul 11 00:41:13 2021
+++ xsrc/external/mit/libdrm/include/generated_static_table_fourcc.h Sun Jul 11 00:41:13 2021
@@ -0,0 +1,48 @@
+/* AUTOMATICALLY GENERATED by gen_table_fourcc.py. You should modify
+ that script instead of adding here entries manually! */
+static const struct drmFormatModifierInfo drm_format_modifier_table[] = {
+{ DRM_MODIFIER_INVALID(NONE, INVALID_MODIFIER) },
+{ DRM_MODIFIER_LINEAR(NONE, LINEAR) },
+{ DRM_MODIFIER_INTEL(X_TILED, X_TILED) },
+{ DRM_MODIFIER_INTEL(Y_TILED, Y_TILED) },
+{ DRM_MODIFIER_INTEL(Yf_TILED, Yf_TILED) },
+{ DRM_MODIFIER_INTEL(Y_TILED_CCS, Y_TILED_CCS) },
+{ DRM_MODIFIER_INTEL(Yf_TILED_CCS, Yf_TILED_CCS) },
+{ DRM_MODIFIER_INTEL(Y_TILED_GEN12_RC_CCS, Y_TILED_GEN12_RC_CCS) },
+{ DRM_MODIFIER_INTEL(Y_TILED_GEN12_MC_CCS, Y_TILED_GEN12_MC_CCS) },
+{ DRM_MODIFIER(SAMSUNG, 64_32_TILE, 64_32_TILE) },
+{ DRM_MODIFIER(SAMSUNG, 16_16_TILE, 16_16_TILE) },
+{ DRM_MODIFIER(QCOM, COMPRESSED, COMPRESSED) },
+{ DRM_MODIFIER(VIVANTE, TILED, TILED) },
+{ DRM_MODIFIER(VIVANTE, SUPER_TILED, SUPER_TILED) },
+{ DRM_MODIFIER(VIVANTE, SPLIT_TILED, SPLIT_TILED) },
+{ DRM_MODIFIER(VIVANTE, SPLIT_SUPER_TILED, SPLIT_SUPER_TILED) },
+{ DRM_MODIFIER(NVIDIA, TEGRA_TILED, TEGRA_TILED) },
+{ DRM_MODIFIER(NVIDIA, 16BX2_BLOCK_ONE_GOB, 16BX2_BLOCK_ONE_GOB) },
+{ DRM_MODIFIER(NVIDIA, 16BX2_BLOCK_TWO_GOB, 16BX2_BLOCK_TWO_GOB) },
+{ DRM_MODIFIER(NVIDIA, 16BX2_BLOCK_FOUR_GOB, 16BX2_BLOCK_FOUR_GOB) },
+{ DRM_MODIFIER(NVIDIA, 16BX2_BLOCK_EIGHT_GOB, 16BX2_BLOCK_EIGHT_GOB) },
+{ DRM_MODIFIER(NVIDIA, 16BX2_BLOCK_SIXTEEN_GOB, 16BX2_BLOCK_SIXTEEN_GOB) },
+{ DRM_MODIFIER(NVIDIA, 16BX2_BLOCK_THIRTYTWO_GOB, 16BX2_BLOCK_THIRTYTWO_GOB) },
+{ DRM_MODIFIER(BROADCOM, VC4_T_TILED, VC4_T_TILED) },
+{ DRM_MODIFIER(BROADCOM, SAND32, SAND32) },
+{ DRM_MODIFIER(BROADCOM, SAND64, SAND64) },
+{ DRM_MODIFIER(BROADCOM, SAND128, SAND128) },
+{ DRM_MODIFIER(BROADCOM, SAND256, SAND256) },
+{ DRM_MODIFIER(BROADCOM, UIF, UIF) },
+{ DRM_MODIFIER(ARM, 16X16_BLOCK_U_INTERLEAVED, 16X16_BLOCK_U_INTERLEAVED) },
+{ DRM_MODIFIER(ALLWINNER, TILED, TILED) },
+};
+static const struct drmFormatModifierVendorInfo drm_format_modifier_vendor_table[] = {
+{ DRM_FORMAT_MOD_VENDOR_NONE, "NONE" },
+{ DRM_FORMAT_MOD_VENDOR_INTEL, "INTEL" },
+{ DRM_FORMAT_MOD_VENDOR_AMD, "AMD" },
+{ DRM_FORMAT_MOD_VENDOR_NVIDIA, "NVIDIA" },
+{ DRM_FORMAT_MOD_VENDOR_SAMSUNG, "SAMSUNG" },
+{ DRM_FORMAT_MOD_VENDOR_QCOM, "QCOM" },
+{ DRM_FORMAT_MOD_VENDOR_VIVANTE, "VIVANTE" },
+{ DRM_FORMAT_MOD_VENDOR_BROADCOM, "BROADCOM" },
+{ DRM_FORMAT_MOD_VENDOR_ARM, "ARM" },
+{ DRM_FORMAT_MOD_VENDOR_ALLWINNER, "ALLWINNER" },
+{ DRM_FORMAT_MOD_VENDOR_AMLOGIC, "AMLOGIC" },
+};
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: dholland Date: Sun Jul 11 00:35:05 UTC 2021 Modified Files: src/games/fortune/datfiles: fortunes Log Message: add something To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/games/fortune/datfiles/fortunes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/fortunes diff -u src/games/fortune/datfiles/fortunes:1.96 src/games/fortune/datfiles/fortunes:1.97 --- src/games/fortune/datfiles/fortunes:1.96 Mon Nov 9 03:23:14 2020 +++ src/games/fortune/datfiles/fortunes Sun Jul 11 00:35:05 2021 @@ -16307,3 +16307,5 @@ The purpose of computing numbers is not % Iamonthemoonandthereisnowheretogetabeer. Thereisnospacebar. +% +metropole, n.: The axis on which the subway turns.
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Jul 11 00:31:55 UTC 2021
Modified Files:
xsrc/external/mit/libdrm/dist: xf86drm.c xf86drm.h xf86drmMode.c
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu_vamgr.c
xsrc/external/mit/libdrm/dist/tests/modetest: modetest.c
xsrc/external/mit/xterm/dist: fontutils.c misc.c ptyx.h xterm.h
xterm.man
Removed Files:
xsrc/external/mit/libdrm/dist/intel: .gitignore
xsrc/external/mit/libdrm/dist/intel/tests: .gitignore
xsrc/external/mit/libdrm/dist/tegra: .gitignore
xsrc/external/mit/libdrm/dist/tests/nouveau: .gitignore
xsrc/external/mit/libdrm/dist/tests/tegra: .gitignore
Log Message:
merge xterm 368 and libdrm 2.4.107.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 xsrc/external/mit/libdrm/dist/xf86drm.c
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/libdrm/dist/xf86drm.h
cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/libdrm/dist/xf86drmMode.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libdrm/dist/intel/.gitignore
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/intel/tests/.gitignore
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libdrm/dist/tegra/.gitignore
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/libdrm/dist/tests/modetest/modetest.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/tests/nouveau/.gitignore
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libdrm/dist/tests/tegra/.gitignore
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xterm/dist/fontutils.c
cvs rdiff -u -r1.21 -r1.22 xsrc/external/mit/xterm/dist/misc.c
cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xterm/dist/ptyx.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xterm/dist/xterm.h
cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xterm/dist/xterm.man
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/xf86drm.c
diff -u xsrc/external/mit/libdrm/dist/xf86drm.c:1.28 xsrc/external/mit/libdrm/dist/xf86drm.c:1.29
--- xsrc/external/mit/libdrm/dist/xf86drm.c:1.28 Tue Apr 27 03:02:37 2021
+++ xsrc/external/mit/libdrm/dist/xf86drm.c Sun Jul 11 00:31:53 2021
@@ -61,6 +61,7 @@
#include
#endif
#include
+#include
#if defined(__FreeBSD__)
#include
@@ -76,6 +77,7 @@
#include "xf86drm.h"
#include "libdrm_macros.h"
+#include "drm_fourcc.h"
#include "util_math.h"
@@ -128,6 +130,362 @@ static drmServerInfoPtr drm_server_info;
static bool drmNodeIsDRM(int maj, int min);
static char *drmGetMinorNameForFD(int fd, int type);
+#define DRM_MODIFIER(v, f, f_name) \
+ .modifier = DRM_FORMAT_MOD_##v ## _ ##f, \
+ .modifier_name = #f_name
+
+#define DRM_MODIFIER_INVALID(v, f_name) \
+ .modifier = DRM_FORMAT_MOD_INVALID, .modifier_name = #f_name
+
+#define DRM_MODIFIER_LINEAR(v, f_name) \
+ .modifier = DRM_FORMAT_MOD_LINEAR, .modifier_name = #f_name
+
+/* Intel is abit special as the format doesn't follow other vendors naming
+ * scheme */
+#define DRM_MODIFIER_INTEL(f, f_name) \
+ .modifier = I915_FORMAT_MOD_##f, .modifier_name = #f_name
+
+struct drmFormatModifierInfo {
+uint64_t modifier;
+const char *modifier_name;
+};
+
+struct drmFormatModifierVendorInfo {
+uint8_t vendor;
+const char *vendor_name;
+};
+
+#include "generated_static_table_fourcc.h"
+
+struct drmVendorInfo {
+uint8_t vendor;
+char *(*vendor_cb)(uint64_t modifier);
+};
+
+struct drmFormatVendorModifierInfo {
+uint64_t modifier;
+const char *modifier_name;
+};
+
+static char *
+drmGetFormatModifierNameFromArm(uint64_t modifier);
+
+static char *
+drmGetFormatModifierNameFromNvidia(uint64_t modifier);
+
+static char *
+drmGetFormatModifierNameFromAmd(uint64_t modifier);
+
+static char *
+drmGetFormatModifierNameFromAmlogic(uint64_t modifier);
+
+static const struct drmVendorInfo modifier_format_vendor_table[] = {
+{ DRM_FORMAT_MOD_VENDOR_ARM, drmGetFormatModifierNameFromArm },
+{ DRM_FORMAT_MOD_VENDOR_NVIDIA, drmGetFormatModifierNameFromNvidia },
+{ DRM_FORMAT_MOD_VENDOR_AMD, drmGetFormatModifierNameFromAmd },
+{ DRM_FORMAT_MOD_VENDOR_AMLOGIC, drmGetFormatModifierNameFromAmlogic },
+};
+
+#ifndef AFBC_FORMAT_MOD_MODE_VALUE_MASK
+#define AFBC_FORMAT_MOD_MODE_VALUE_MASK 0x000fULL
+#endif
+
+static const struct drmFormatVendorModifierInfo arm_mode_value_table[] = {
+{ AFBC_FORMAT_MOD_YTR, "YTR" },
+{ AFBC_FORMAT_MOD_SPLIT,"SPLIT" },
+{ AFBC_FORMAT_MOD_SPARSE, "SPARSE" },
+{ AFBC_FORMAT_MOD_CBR, "CBR" },
+{ AFBC_FORMAT_MOD_TILED,"TILED" },
+{ AFBC_FORMAT_MOD_SC, "SC" },
+{ AFBC_FORMAT_MOD_DB, "DB" },
+{ AFBC_FORMAT_MOD_BCH, "BCH" },
+{ AFBC_FORMAT_MOD_USM, "USM" },
+};
+
+static bool is_x_t_amd_gfx9_tile(uint64_t tile)
CVS import: xsrc/external/mit/xterm/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 11 00:27:26 UTC 2021 Update of /cvsroot/xsrc/external/mit/xterm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv29376 Log Message: initial import of xterm-368 Status: Vendor Tag: xorg Release Tags: xterm-368 U xsrc/external/mit/xterm/dist/testxmc.c C xsrc/external/mit/xterm/dist/misc.c U xsrc/external/mit/xterm/dist/trace.h U xsrc/external/mit/xterm/dist/graphics_sixel.c C xsrc/external/mit/xterm/dist/xterm.man U xsrc/external/mit/xterm/dist/error.h U xsrc/external/mit/xterm/dist/button.c U xsrc/external/mit/xterm/dist/graphics.h U xsrc/external/mit/xterm/dist/Makefile.in U xsrc/external/mit/xterm/dist/sinstall.sh C xsrc/external/mit/xterm/dist/xterm.h U xsrc/external/mit/xterm/dist/cachedGCs.c U xsrc/external/mit/xterm/dist/XTerm.ad U xsrc/external/mit/xterm/dist/main.c U xsrc/external/mit/xterm/dist/MANIFEST U xsrc/external/mit/xterm/dist/resize.man U xsrc/external/mit/xterm/dist/precompose.h U xsrc/external/mit/xterm/dist/configure.in U xsrc/external/mit/xterm/dist/charclass.h U xsrc/external/mit/xterm/dist/config.guess U xsrc/external/mit/xterm/dist/256colres.h U xsrc/external/mit/xterm/dist/main.h U xsrc/external/mit/xterm/dist/88colres.pl U xsrc/external/mit/xterm/dist/gen-charsets.pl U xsrc/external/mit/xterm/dist/graphics_regis.c U xsrc/external/mit/xterm/dist/VTparse.def U xsrc/external/mit/xterm/dist/df-install.in U xsrc/external/mit/xterm/dist/UXTerm.ad U xsrc/external/mit/xterm/dist/linedata.c U xsrc/external/mit/xterm/dist/TekPrsTbl.c C xsrc/external/mit/xterm/dist/ptyx.h U xsrc/external/mit/xterm/dist/xterm.desktop U xsrc/external/mit/xterm/dist/version.h U xsrc/external/mit/xterm/dist/configure U xsrc/external/mit/xterm/dist/graphics.c U xsrc/external/mit/xterm/dist/util.c U xsrc/external/mit/xterm/dist/doublechr.c U xsrc/external/mit/xterm/dist/ptydata.c U xsrc/external/mit/xterm/dist/link_axp.com U xsrc/external/mit/xterm/dist/terminfo U xsrc/external/mit/xterm/dist/make.com U xsrc/external/mit/xterm/dist/data.c U xsrc/external/mit/xterm/dist/minstall.in U xsrc/external/mit/xterm/dist/THANKS U xsrc/external/mit/xterm/dist/charproc.c U xsrc/external/mit/xterm/dist/fontutils.h U xsrc/external/mit/xterm/dist/graphics_regis.h U xsrc/external/mit/xterm/dist/screen.c U xsrc/external/mit/xterm/dist/config.sub U xsrc/external/mit/xterm/dist/vms.c U xsrc/external/mit/xterm/dist/xterm.log.html U xsrc/external/mit/xterm/dist/COPYING U xsrc/external/mit/xterm/dist/ctlseqs.ms U xsrc/external/mit/xterm/dist/html.c U xsrc/external/mit/xterm/dist/README.os390 U xsrc/external/mit/xterm/dist/scrollbar.c U xsrc/external/mit/xterm/dist/uxterm.desktop U xsrc/external/mit/xterm/dist/KOI8RXTerm.ad U xsrc/external/mit/xterm/dist/precompose.c U xsrc/external/mit/xterm/dist/AAA_README_VMS.txt U xsrc/external/mit/xterm/dist/xutf8.h U xsrc/external/mit/xterm/dist/NEWS U xsrc/external/mit/xterm/dist/plink.sh U xsrc/external/mit/xterm/dist/graphics_sixel.h U xsrc/external/mit/xterm/dist/scrollback.c U xsrc/external/mit/xterm/dist/INSTALL U xsrc/external/mit/xterm/dist/resize.c U xsrc/external/mit/xterm/dist/run-tic.sh U xsrc/external/mit/xterm/dist/charsets.c U xsrc/external/mit/xterm/dist/xstrings.h U xsrc/external/mit/xterm/dist/xtermcap.h U xsrc/external/mit/xterm/dist/svg.c U xsrc/external/mit/xterm/dist/charclass.c U xsrc/external/mit/xterm/dist/Tests U xsrc/external/mit/xterm/dist/input.c U xsrc/external/mit/xterm/dist/XTerm-col.ad U xsrc/external/mit/xterm/dist/xutf8.c U xsrc/external/mit/xterm/dist/Imakefile U xsrc/external/mit/xterm/dist/wcwidth.h U xsrc/external/mit/xterm/dist/koi8rxterm U xsrc/external/mit/xterm/dist/VTparse.h U xsrc/external/mit/xterm/dist/menu.h U xsrc/external/mit/xterm/dist/gen-pc-fkeys.pl U xsrc/external/mit/xterm/dist/xstrings.c U xsrc/external/mit/xterm/dist/xtermcap.c U xsrc/external/mit/xterm/dist/tabs.c U xsrc/external/mit/xterm/dist/keysym2ucs.c U xsrc/external/mit/xterm/dist/menu.c U xsrc/external/mit/xterm/dist/88colres.h U xsrc/external/mit/xterm/dist/vms.h U xsrc/external/mit/xterm/dist/ctlseqs.txt U xsrc/external/mit/xterm/dist/termcap U xsrc/external/mit/xterm/dist/aclocal.m4 U xsrc/external/mit/xterm/dist/version.c U xsrc/external/mit/xterm/dist/install-sh U xsrc/external/mit/xterm/dist/koi8rxterm.man U xsrc/external/mit/xterm/dist/256colres.pl U xsrc/external/mit/xterm/dist/Tekparse.def U xsrc/external/mit/xterm/dist/xterm_axp.opt U xsrc/external/mit/xterm/dist/uxterm C xsrc/external/mit/xterm/dist/fontutils.c U xsrc/external/mit/xterm/dist/README U xsrc/external/mit/xterm/dist/xterm.appdata.xml U xsrc/external/mit/xterm/dist/xterm_io.h U xsrc/external/mit/xterm/dist/xtermcfg.hin U xsrc/external/mit/xterm/dist/xterm.dat U xsrc/external/mit/xterm/dist/data.h U xsrc/external/mit/xterm/dist/uxterm.man U xsrc/external/mit/xterm/dist/Tekparse.h U xsrc/external/mit/xterm/dist/Tekproc.c U xsrc/external/mit/xterm/dist/keysym2ucs.h U xsrc/external/mit/xterm/dist/VTPrsTbl.c U
CVS import: xsrc/external/mit/libdrm/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 11 00:27:21 UTC 2021 Update of /cvsroot/xsrc/external/mit/libdrm/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8158 Log Message: initial import of libdrm-2.4.107 Status: Vendor Tag: xorg Release Tags: libdrm-2-4-107 U xsrc/external/mit/libdrm/dist/.editorconfig U xsrc/external/mit/libdrm/dist/Android.common.mk U xsrc/external/mit/libdrm/dist/Android.mk U xsrc/external/mit/libdrm/dist/CONTRIBUTING.rst U xsrc/external/mit/libdrm/dist/CleanSpec.mk U xsrc/external/mit/libdrm/dist/Makefile.sources U xsrc/external/mit/libdrm/dist/README.rst U xsrc/external/mit/libdrm/dist/RELEASING U xsrc/external/mit/libdrm/dist/core-symbols.txt N xsrc/external/mit/libdrm/dist/gen_table_fourcc.py U xsrc/external/mit/libdrm/dist/libdrm.pc.in U xsrc/external/mit/libdrm/dist/libdrm_lists.h U xsrc/external/mit/libdrm/dist/libdrm_macros.h U xsrc/external/mit/libdrm/dist/libsync.h U xsrc/external/mit/libdrm/dist/meson.build U xsrc/external/mit/libdrm/dist/meson_options.txt U xsrc/external/mit/libdrm/dist/symbols-check.py U xsrc/external/mit/libdrm/dist/util_double_list.h U xsrc/external/mit/libdrm/dist/util_math.h U xsrc/external/mit/libdrm/dist/xf86atomic.h C xsrc/external/mit/libdrm/dist/xf86drm.c C xsrc/external/mit/libdrm/dist/xf86drm.h U xsrc/external/mit/libdrm/dist/xf86drmHash.c U xsrc/external/mit/libdrm/dist/xf86drmHash.h C xsrc/external/mit/libdrm/dist/xf86drmMode.c U xsrc/external/mit/libdrm/dist/xf86drmMode.h U xsrc/external/mit/libdrm/dist/xf86drmRandom.c U xsrc/external/mit/libdrm/dist/xf86drmRandom.h U xsrc/external/mit/libdrm/dist/xf86drmSL.c U xsrc/external/mit/libdrm/dist/amdgpu/.editorconfig U xsrc/external/mit/libdrm/dist/amdgpu/Android.mk U xsrc/external/mit/libdrm/dist/amdgpu/Makefile.sources U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu-symbols.txt U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_asic_id.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_bo.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_cs.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_device.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_gpu_info.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_internal.h C xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vamgr.c U xsrc/external/mit/libdrm/dist/amdgpu/amdgpu_vm.c U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.c U xsrc/external/mit/libdrm/dist/amdgpu/handle_table.h U xsrc/external/mit/libdrm/dist/amdgpu/libdrm_amdgpu.pc.in U xsrc/external/mit/libdrm/dist/amdgpu/meson.build U xsrc/external/mit/libdrm/dist/android/gralloc_handle.h U xsrc/external/mit/libdrm/dist/data/Android.mk U xsrc/external/mit/libdrm/dist/data/amdgpu.ids U xsrc/external/mit/libdrm/dist/data/meson.build U xsrc/external/mit/libdrm/dist/etnaviv/Android.mk U xsrc/external/mit/libdrm/dist/etnaviv/Makefile.sources U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv-symbols.txt U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_bo_cache.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_cmd_stream.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_device.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drm.h U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_drmif.h U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_gpu.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_perfmon.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_pipe.c U xsrc/external/mit/libdrm/dist/etnaviv/etnaviv_priv.h U xsrc/external/mit/libdrm/dist/etnaviv/libdrm_etnaviv.pc.in U xsrc/external/mit/libdrm/dist/etnaviv/meson.build U xsrc/external/mit/libdrm/dist/exynos/exynos-symbols.txt U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.c U xsrc/external/mit/libdrm/dist/exynos/exynos_drm.h U xsrc/external/mit/libdrm/dist/exynos/exynos_drmif.h U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.c U xsrc/external/mit/libdrm/dist/exynos/exynos_fimg2d.h U xsrc/external/mit/libdrm/dist/exynos/fimg2d_reg.h U xsrc/external/mit/libdrm/dist/exynos/libdrm_exynos.pc.in U xsrc/external/mit/libdrm/dist/exynos/meson.build U xsrc/external/mit/libdrm/dist/freedreno/Android.mk U xsrc/external/mit/libdrm/dist/freedreno/Makefile.sources U xsrc/external/mit/libdrm/dist/freedreno/freedreno-symbols.txt U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_bo_cache.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_device.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_drmif.h U xsrc/external/mit/libdrm/dist/freedreno/freedreno_pipe.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_priv.h U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.c U xsrc/external/mit/libdrm/dist/freedreno/freedreno_ringbuffer.h U xsrc/external/mit/libdrm/dist/freedreno/libdrm_freedreno.pc.in U xsrc/external/mit/libdrm/dist/freedreno/meson.build U xsrc/external/mit/libdrm/dist/freedreno/kgsl/README U xsrc/external/mit/libdrm/dist/freedreno/kgsl/kgsl_bo.c U
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Sun Jul 11 00:13:49 UTC 2021 Modified Files: src/share/mk: bsd.x11.mk Log Message: xorg-server is now 1.20.12. To generate a diff of this commit: cvs rdiff -u -r1.139 -r1.140 src/share/mk/bsd.x11.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.x11.mk diff -u src/share/mk/bsd.x11.mk:1.139 src/share/mk/bsd.x11.mk:1.140 --- src/share/mk/bsd.x11.mk:1.139 Thu Jun 3 07:40:48 2021 +++ src/share/mk/bsd.x11.mk Sun Jul 11 00:13:49 2021 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.x11.mk,v 1.139 2021/06/03 07:40:48 rin Exp $ +# $NetBSD: bsd.x11.mk,v 1.140 2021/07/11 00:13:49 mrg Exp $ .include @@ -133,7 +133,7 @@ XORG_SERVER_MINOR= 10 XORG_SERVER_TEENY= 6 .else XORG_SERVER_MINOR= 20 -XORG_SERVER_TEENY= 11 +XORG_SERVER_TEENY= 12 .endif XVENDORNAMESHORT= '"X.Org"'
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sun Jul 11 00:13:27 UTC 2021
Modified Files:
xsrc/external/mit/xkeyboard-config/dist: configure
xsrc/external/mit/xkeyboard-config/dist/symbols: Makefile.in in pl
xsrc/external/mit/xorg-server/dist: configure configure.ac
xsrc/external/mit/xorg-server/dist/dix: devices.c
xsrc/external/mit/xorg-server/dist/glx: glxcmds.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Bus.c
xf86Config.c xf86Helper.c xf86str.h
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
driver.c driver.h drmmode_display.c present.c vblank.c
xsrc/external/mit/xorg-server/dist/randr: randrstr.h
xsrc/external/mit/xorg-server/include: dix-config.h version-config.h
xf86Build.h xorg-config.h xorg-server.h
Log Message:
merge xorg-server 1.20.12 and xkeyboard-config 2.33.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 xsrc/external/mit/xkeyboard-config/dist/configure
cvs rdiff -u -r1.20 -r1.21 \
xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.in
cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xkeyboard-config/dist/symbols/in
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xkeyboard-config/dist/symbols/pl
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-server/dist/configure
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/dist/dix/devices.c
cvs rdiff -u -r1.13 -r1.14 xsrc/external/mit/xorg-server/dist/glx/glxcmds.c
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Bus.c
cvs rdiff -u -r1.15 -r1.16 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Helper.c
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86str.h
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.c \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/driver.h \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/present.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/drmmode_display.c
\
xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting/vblank.c
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xorg-server/dist/randr/randrstr.h
cvs rdiff -u -r1.41 -r1.42 xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.12 -r1.13 \
xsrc/external/mit/xorg-server/include/version-config.h
cvs rdiff -u -r1.11 -r1.12 xsrc/external/mit/xorg-server/include/xf86Build.h
cvs rdiff -u -r1.22 -r1.23 \
xsrc/external/mit/xorg-server/include/xorg-config.h \
xsrc/external/mit/xorg-server/include/xorg-server.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xkeyboard-config/dist/configure
diff -u xsrc/external/mit/xkeyboard-config/dist/configure:1.20 xsrc/external/mit/xkeyboard-config/dist/configure:1.21
--- xsrc/external/mit/xkeyboard-config/dist/configure:1.20 Tue Apr 27 03:38:48 2021
+++ xsrc/external/mit/xkeyboard-config/dist/configure Sun Jul 11 00:13:26 2021
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.32.
+# Generated by GNU Autoconf 2.69 for xkeyboard-config 2.33.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='xkeyboard-config'
PACKAGE_TARNAME='xkeyboard-config'
-PACKAGE_VERSION='2.32'
-PACKAGE_STRING='xkeyboard-config 2.32'
+PACKAGE_VERSION='2.33'
+PACKAGE_STRING='xkeyboard-config 2.33'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -717,6 +717,7 @@ infodir
docdir
oldincludedir
includedir
+runstatedir
localstatedir
sharedstatedir
sysconfdir
@@ -807,6 +808,7 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
includedir='${prefix}/include'
oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1059,6 +1061,15 @@ do
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+runstatedir=$ac_optarg ;;
+
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=*
CVS import: xsrc/external/mit/xorg-server/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 11 00:08:58 UTC 2021 Update of /cvsroot/xsrc/external/mit/xorg-server/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8826 Log Message: initial import of xorg-server-1.20.12 Status: Vendor Tag: xorg Release Tags: xorg-server-1-20-12 U xsrc/external/mit/xorg-server/dist/test-driver U xsrc/external/mit/xorg-server/dist/compile U xsrc/external/mit/xorg-server/dist/autogen.sh U xsrc/external/mit/xorg-server/dist/ChangeLog U xsrc/external/mit/xorg-server/dist/README.md C xsrc/external/mit/xorg-server/dist/configure.ac C xsrc/external/mit/xorg-server/dist/configure U xsrc/external/mit/xorg-server/dist/Makefile.am U xsrc/external/mit/xorg-server/dist/manpages.am U xsrc/external/mit/xorg-server/dist/meson_options.txt U xsrc/external/mit/xorg-server/dist/ltmain.sh U xsrc/external/mit/xorg-server/dist/COPYING U xsrc/external/mit/xorg-server/dist/ylwrap U xsrc/external/mit/xorg-server/dist/depcomp U xsrc/external/mit/xorg-server/dist/xserver.ent.in U xsrc/external/mit/xorg-server/dist/config.guess U xsrc/external/mit/xorg-server/dist/xorg-server.pc.in U xsrc/external/mit/xorg-server/dist/missing U xsrc/external/mit/xorg-server/dist/Makefile.in U xsrc/external/mit/xorg-server/dist/config.sub U xsrc/external/mit/xorg-server/dist/meson.build U xsrc/external/mit/xorg-server/dist/xorg-server.m4 U xsrc/external/mit/xorg-server/dist/docbook.am U xsrc/external/mit/xorg-server/dist/devbook.am U xsrc/external/mit/xorg-server/dist/install-sh U xsrc/external/mit/xorg-server/dist/aclocal.m4 U xsrc/external/mit/xorg-server/dist/INSTALL U xsrc/external/mit/xorg-server/dist/m4/lt~obsolete.m4 U xsrc/external/mit/xorg-server/dist/m4/ltversion.m4 U xsrc/external/mit/xorg-server/dist/m4/ltsugar.m4 U xsrc/external/mit/xorg-server/dist/m4/ax_pthread.m4 U xsrc/external/mit/xorg-server/dist/m4/ltoptions.m4 U xsrc/external/mit/xorg-server/dist/m4/libtool.m4 U xsrc/external/mit/xorg-server/dist/m4/ac_define_dir.m4 U xsrc/external/mit/xorg-server/dist/test/touch.c U xsrc/external/mit/xorg-server/dist/test/hashtabletest.c U xsrc/external/mit/xorg-server/dist/test/Makefile.am U xsrc/external/mit/xorg-server/dist/test/fixes.c U xsrc/external/mit/xorg-server/dist/test/README U xsrc/external/mit/xorg-server/dist/test/string.c U xsrc/external/mit/xorg-server/dist/test/misc.c U xsrc/external/mit/xorg-server/dist/test/xtest.c U xsrc/external/mit/xorg-server/dist/test/simple-xinit.c U xsrc/external/mit/xorg-server/dist/test/tests.c U xsrc/external/mit/xorg-server/dist/test/tests.h U xsrc/external/mit/xorg-server/dist/test/xfree86.c U xsrc/external/mit/xorg-server/dist/test/Makefile.in U xsrc/external/mit/xorg-server/dist/test/list.c U xsrc/external/mit/xorg-server/dist/test/signal-logging.c U xsrc/external/mit/xorg-server/dist/test/meson.build U xsrc/external/mit/xorg-server/dist/test/tests-common.h U xsrc/external/mit/xorg-server/dist/test/tests-common.c U xsrc/external/mit/xorg-server/dist/test/test_xkb.c U xsrc/external/mit/xorg-server/dist/test/input.c U xsrc/external/mit/xorg-server/dist/test/bigreq/request-length.c U xsrc/external/mit/xorg-server/dist/test/bigreq/meson.build U xsrc/external/mit/xorg-server/dist/test/xi1/protocol-xchangedevicecontrol.c U xsrc/external/mit/xorg-server/dist/test/scripts/xvfb-piglit.sh U xsrc/external/mit/xorg-server/dist/test/scripts/xephyr-glamor-piglit.sh U xsrc/external/mit/xorg-server/dist/test/scripts/xinit-piglit-session.sh U xsrc/external/mit/xorg-server/dist/test/scripts/run-piglit.sh U xsrc/external/mit/xorg-server/dist/test/sync/meson.build U xsrc/external/mit/xorg-server/dist/test/sync/sync.c U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiwarppointer.c U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xipassivegrabdevice.c U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerydevice.c U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-common.c U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiselectevents.c U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xigetselectedevents.c U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-common.h U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiqueryversion.c U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-eventconvert.c U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xiquerypointer.c U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xisetclientpointer.c U xsrc/external/mit/xorg-server/dist/test/xi2/xi2.c U xsrc/external/mit/xorg-server/dist/test/xi2/protocol-xigetclientpointer.c U xsrc/external/mit/xorg-server/dist/glx/glxbyteorder.h U xsrc/external/mit/xorg-server/dist/glx/indirect_size_get.c U xsrc/external/mit/xorg-server/dist/glx/Makefile.am U xsrc/external/mit/xorg-server/dist/glx/rensize.c U xsrc/external/mit/xorg-server/dist/glx/singlesize.h U xsrc/external/mit/xorg-server/dist/glx/vnd_dispatch_stubs.c U xsrc/external/mit/xorg-server/dist/glx/renderpix.c U
CVS import: xsrc/external/mit/xkeyboard-config/dist
Module Name:xsrc Committed By: mrg Date: Sun Jul 11 00:08:34 UTC 2021 Update of /cvsroot/xsrc/external/mit/xkeyboard-config/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27443 Log Message: initial import of xkeyboard-config-2.33 Status: Vendor Tag: xorg Release Tags: xkeyboard-config-2-33 U xsrc/external/mit/xkeyboard-config/dist/install-sh U xsrc/external/mit/xkeyboard-config/dist/README U xsrc/external/mit/xkeyboard-config/dist/meson.build U xsrc/external/mit/xkeyboard-config/dist/aclocal.m4 U xsrc/external/mit/xkeyboard-config/dist/compile U xsrc/external/mit/xkeyboard-config/dist/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/config.rpath U xsrc/external/mit/xkeyboard-config/dist/AUTHORS C xsrc/external/mit/xkeyboard-config/dist/configure U xsrc/external/mit/xkeyboard-config/dist/xkeyboard-config.pc.in U xsrc/external/mit/xkeyboard-config/dist/NEWS U xsrc/external/mit/xkeyboard-config/dist/ABOUT-NLS U xsrc/external/mit/xkeyboard-config/dist/Makefile.in U xsrc/external/mit/xkeyboard-config/dist/config.sub U xsrc/external/mit/xkeyboard-config/dist/COPYING U xsrc/external/mit/xkeyboard-config/dist/missing U xsrc/external/mit/xkeyboard-config/dist/config.guess U xsrc/external/mit/xkeyboard-config/dist/configure.ac U xsrc/external/mit/xkeyboard-config/dist/ChangeLog U xsrc/external/mit/xkeyboard-config/dist/meson_options.txt U xsrc/external/mit/xkeyboard-config/dist/autogen.sh U xsrc/external/mit/xkeyboard-config/dist/symbols/gb U xsrc/external/mit/xkeyboard-config/dist/symbols/eu U xsrc/external/mit/xkeyboard-config/dist/symbols/trans U xsrc/external/mit/xkeyboard-config/dist/symbols/tw U xsrc/external/mit/xkeyboard-config/dist/symbols/uz U xsrc/external/mit/xkeyboard-config/dist/symbols/tg U xsrc/external/mit/xkeyboard-config/dist/symbols/ara U xsrc/external/mit/xkeyboard-config/dist/symbols/capslock U xsrc/external/mit/xkeyboard-config/dist/symbols/inet U xsrc/external/mit/xkeyboard-config/dist/symbols/se U xsrc/external/mit/xkeyboard-config/dist/symbols/fr U xsrc/external/mit/xkeyboard-config/dist/symbols/eurosign U xsrc/external/mit/xkeyboard-config/dist/symbols/iq U xsrc/external/mit/xkeyboard-config/dist/symbols/typo U xsrc/external/mit/xkeyboard-config/dist/symbols/by U xsrc/external/mit/xkeyboard-config/dist/symbols/kpdl U xsrc/external/mit/xkeyboard-config/dist/symbols/az U xsrc/external/mit/xkeyboard-config/dist/symbols/br U xsrc/external/mit/xkeyboard-config/dist/symbols/cm U xsrc/external/mit/xkeyboard-config/dist/symbols/eg U xsrc/external/mit/xkeyboard-config/dist/symbols/de U xsrc/external/mit/xkeyboard-config/dist/symbols/kz U xsrc/external/mit/xkeyboard-config/dist/symbols/tj U xsrc/external/mit/xkeyboard-config/dist/symbols/Makefile.am U xsrc/external/mit/xkeyboard-config/dist/symbols/level3 U xsrc/external/mit/xkeyboard-config/dist/symbols/us U xsrc/external/mit/xkeyboard-config/dist/symbols/es U xsrc/external/mit/xkeyboard-config/dist/symbols/latam U xsrc/external/mit/xkeyboard-config/dist/symbols/apl U xsrc/external/mit/xkeyboard-config/dist/symbols/ph U xsrc/external/mit/xkeyboard-config/dist/symbols/it U xsrc/external/mit/xkeyboard-config/dist/symbols/bd U xsrc/external/mit/xkeyboard-config/dist/symbols/tr U xsrc/external/mit/xkeyboard-config/dist/symbols/cn U xsrc/external/mit/xkeyboard-config/dist/symbols/gh U xsrc/external/mit/xkeyboard-config/dist/symbols/ua U xsrc/external/mit/xkeyboard-config/dist/symbols/empty U xsrc/external/mit/xkeyboard-config/dist/symbols/et U xsrc/external/mit/xkeyboard-config/dist/symbols/bt U xsrc/external/mit/xkeyboard-config/dist/symbols/kg U xsrc/external/mit/xkeyboard-config/dist/symbols/is U xsrc/external/mit/xkeyboard-config/dist/symbols/ee U xsrc/external/mit/xkeyboard-config/dist/symbols/tz U xsrc/external/mit/xkeyboard-config/dist/symbols/am U xsrc/external/mit/xkeyboard-config/dist/symbols/ma U xsrc/external/mit/xkeyboard-config/dist/symbols/si U xsrc/external/mit/xkeyboard-config/dist/symbols/ge U xsrc/external/mit/xkeyboard-config/dist/symbols/id U xsrc/external/mit/xkeyboard-config/dist/symbols/cz U xsrc/external/mit/xkeyboard-config/dist/symbols/za U xsrc/external/mit/xkeyboard-config/dist/symbols/au U xsrc/external/mit/xkeyboard-config/dist/symbols/srvr_ctrl U xsrc/external/mit/xkeyboard-config/dist/symbols/keypad U xsrc/external/mit/xkeyboard-config/dist/symbols/ca U xsrc/external/mit/xkeyboard-config/dist/symbols/shift U xsrc/external/mit/xkeyboard-config/dist/symbols/mt U xsrc/external/mit/xkeyboard-config/dist/symbols/gr U xsrc/external/mit/xkeyboard-config/dist/symbols/ru U xsrc/external/mit/xkeyboard-config/dist/symbols/olpc U xsrc/external/mit/xkeyboard-config/dist/symbols/compose U xsrc/external/mit/xkeyboard-config/dist/symbols/mm U xsrc/external/mit/xkeyboard-config/dist/symbols/fi U xsrc/external/mit/xkeyboard-config/dist/symbols/level2 U xsrc/external/mit/xkeyboard-config/dist/symbols/jv U xsrc/external/mit/xkeyboard-config/dist/symbols/af U
CVS commit: src
Module Name:src
Committed By: mrg
Date: Sun Jul 11 00:08:06 UTC 2021
Modified Files:
src/distrib/sets/lists/xbase: shl.mi
src/distrib/sets/lists/xdebug: shl.mi
src/external/mit/xorg/lib/libXfixes: Makefile shlib_version
Log Message:
bump minor for for libXfixes 6.0.0's new function
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/libXfixes/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libXfixes/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.94 src/distrib/sets/lists/xbase/shl.mi:1.95
--- src/distrib/sets/lists/xbase/shl.mi:1.94 Tue Apr 27 06:50:27 2021
+++ src/distrib/sets/lists/xbase/shl.mi Sun Jul 11 00:08:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.94 2021/04/27 06:50:27 mrg Exp $
+# $NetBSD: shl.mi,v 1.95 2021/07/11 00:08:06 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -91,7 +91,7 @@
./usr/X11R7/lib/libXext.so.7.1 xbase-libXext-lib xorg,compatx11file
./usr/X11R7/lib/libXfixes.so xbase-libXfixes-lib xorg,compatx11file
./usr/X11R7/lib/libXfixes.so.4 xbase-libXfixes-lib xorg,compatx11file
-./usr/X11R7/lib/libXfixes.so.4.0 xbase-libXfixes-lib xorg,compatx11file
+./usr/X11R7/lib/libXfixes.so.4.1 xbase-libXfixes-lib xorg,compatx11file
./usr/X11R7/lib/libXfont.so xbase-libXfont-lib xorg,compatx11file
./usr/X11R7/lib/libXfont.so.3 xbase-libXfont-lib xorg,compatx11file
./usr/X11R7/lib/libXfont.so.3.0 xbase-libXfont-lib xorg,compatx11file
Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.60 src/distrib/sets/lists/xdebug/shl.mi:1.61
--- src/distrib/sets/lists/xdebug/shl.mi:1.60 Tue Apr 27 06:50:27 2021
+++ src/distrib/sets/lists/xdebug/shl.mi Sun Jul 11 00:08:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.60 2021/04/27 06:50:27 mrg Exp $
+# $NetBSD: shl.mi,v 1.61 2021/07/11 00:08:06 mrg Exp $
./usr/libdata/debug/usr/X11R7/lib base-sys-usr xorg,debug,compatx11dir
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug xorg,obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug xorg,obsolete xorg,obsolete
@@ -34,7 +34,7 @@
./usr/libdata/debug/usr/X11R7/lib/libXdmcp.so.7.0.debug xdebug-libXdmcp-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXevie.so.2.0.debug xdebug-obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/libXext.so.7.1.debug xdebug-libXext-debug xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libXfixes.so.4.0.debug xdebug-libXfixes-debug xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libXfixes.so.4.1.debug xdebug-libXfixes-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXfont.so.3.0.debug xdebug-libXfont-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXfont2.so.2.0.debug xdebug-libXfont2-debug xorg,debug,compatx11file
./usr/libdata/debug/usr/X11R7/lib/libXfontcache.so.2.0.debug xdebug-obsolete xorg,obsolete
Index: src/external/mit/xorg/lib/libXfixes/Makefile
diff -u src/external/mit/xorg/lib/libXfixes/Makefile:1.5 src/external/mit/xorg/lib/libXfixes/Makefile:1.6
--- src/external/mit/xorg/lib/libXfixes/Makefile:1.5 Fri May 31 00:47:53 2013
+++ src/external/mit/xorg/lib/libXfixes/Makefile Sun Jul 11 00:08:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/05/31 00:47:53 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2021/07/11 00:08:06 mrg Exp $
.include
@@ -8,7 +8,7 @@ XFIXESDIR= ${X11SRCDIR.${LIB}}
.PATH: ${XFIXESDIR}/src
.PATH: ${XFIXESDIR}/man
.PATH: ${XFIXESDIR}/include/X11/extensions
-SRCS= Cursor.c Region.c SaveSet.c Selection.c Xfixes.c
+SRCS= Cursor.c Disconnect.c Region.c SaveSet.c Selection.c Xfixes.c
INCS= Xfixes.h
INCSDIR=${X11INCDIR}/X11/extensions
Index: src/external/mit/xorg/lib/libXfixes/shlib_version
diff -u src/external/mit/xorg/lib/libXfixes/shlib_version:1.2 src/external/mit/xorg/lib/libXfixes/shlib_version:1.3
--- src/external/mit/xorg/lib/libXfixes/shlib_version:1.2 Sun Jan 11 03:10:11 2009
+++ src/external/mit/xorg/lib/libXfixes/shlib_version Sun Jul 11 00:08:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.2 2009/01/11 03:10:11 christos Exp $
+# $NetBSD: shlib_version,v 1.3 2021/07/11 00:08:06 mrg Exp $
#
major=4
-minor=0
+minor=1
CVS import: xsrc/external/mit/xorgproto/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 10 23:34:30 UTC 2021 Update of /cvsroot/xsrc/external/mit/xorgproto/dist In directory ivanova.netbsd.org:/tmp/cvs-serv27840 Log Message: initial import of xorgproto-2021.4 Status: Vendor Tag: xorg Release Tags: xorgproto-2021-4 U xsrc/external/mit/xorgproto/dist/kbproto.pc.in U xsrc/external/mit/xorgproto/dist/COPYING-presentproto U xsrc/external/mit/xorgproto/dist/COPYING-kbproto U xsrc/external/mit/xorgproto/dist/recordproto.pc.in U xsrc/external/mit/xorgproto/dist/configure U xsrc/external/mit/xorgproto/dist/config.sub U xsrc/external/mit/xorgproto/dist/docbook.am U xsrc/external/mit/xorgproto/dist/xextproto.pc.in U xsrc/external/mit/xorgproto/dist/xineramaproto.pc.in U xsrc/external/mit/xorgproto/dist/dpmsproto.pc.in U xsrc/external/mit/xorgproto/dist/xf86rushproto.pc.in U xsrc/external/mit/xorgproto/dist/xf86dgaproto.pc.in U xsrc/external/mit/xorgproto/dist/COPYING-fixesproto U xsrc/external/mit/xorgproto/dist/fixesproto.pc.in U xsrc/external/mit/xorgproto/dist/configure.ac U xsrc/external/mit/xorgproto/dist/xf86bigfontproto.pc.in U xsrc/external/mit/xorgproto/dist/xproto.pc.in U xsrc/external/mit/xorgproto/dist/resourceproto.pc.in U xsrc/external/mit/xorgproto/dist/randrproto.pc.in U xsrc/external/mit/xorgproto/dist/COPYING-xf86vidmodeproto U xsrc/external/mit/xorgproto/dist/presentproto.txt U xsrc/external/mit/xorgproto/dist/COPYING-xf86miscproto U xsrc/external/mit/xorgproto/dist/COPYING-xextproto U xsrc/external/mit/xorgproto/dist/AUTHORS U xsrc/external/mit/xorgproto/dist/README.md U xsrc/external/mit/xorgproto/dist/meson.build U xsrc/external/mit/xorgproto/dist/dri3proto.pc.in N xsrc/external/mit/xorgproto/dist/test-driver U xsrc/external/mit/xorgproto/dist/COPYING-dri3proto U xsrc/external/mit/xorgproto/dist/renderproto.pc.in U xsrc/external/mit/xorgproto/dist/xproxymngproto.pc.in U xsrc/external/mit/xorgproto/dist/aclocal.m4 U xsrc/external/mit/xorgproto/dist/COPYING-inputproto U xsrc/external/mit/xorgproto/dist/fontcacheproto.pc.in U xsrc/external/mit/xorgproto/dist/COPYING-pmproto U xsrc/external/mit/xorgproto/dist/fixesproto.txt U xsrc/external/mit/xorgproto/dist/xv-protocol-v2.txt U xsrc/external/mit/xorgproto/dist/COPYING-resourceproto U xsrc/external/mit/xorgproto/dist/printproto.pc.in U xsrc/external/mit/xorgproto/dist/Makefile.in U xsrc/external/mit/xorgproto/dist/COPYING-xcmiscproto U xsrc/external/mit/xorgproto/dist/dri3proto.txt U xsrc/external/mit/xorgproto/dist/COPYING-xf86dgaproto U xsrc/external/mit/xorgproto/dist/xf86miscproto.pc.in U xsrc/external/mit/xorgproto/dist/damageproto.pc.in U xsrc/external/mit/xorgproto/dist/COPYING-recordproto U xsrc/external/mit/xorgproto/dist/presentproto.pc.in U xsrc/external/mit/xorgproto/dist/COPYING-scrnsaverproto U xsrc/external/mit/xorgproto/dist/COPYING-lg3dproto U xsrc/external/mit/xorgproto/dist/fontsproto.pc.in U xsrc/external/mit/xorgproto/dist/autogen.sh U xsrc/external/mit/xorgproto/dist/damageproto.txt U xsrc/external/mit/xorgproto/dist/inputproto.pc.in U xsrc/external/mit/xorgproto/dist/COPYING-trapproto U xsrc/external/mit/xorgproto/dist/dri2proto.txt U xsrc/external/mit/xorgproto/dist/applewmproto.pc.in U xsrc/external/mit/xorgproto/dist/COPYING-xf86driproto U xsrc/external/mit/xorgproto/dist/renderproto.txt U xsrc/external/mit/xorgproto/dist/dmxproto.pc.in U xsrc/external/mit/xorgproto/dist/windowswmproto.pc.in U xsrc/external/mit/xorgproto/dist/COPYING-xf86bigfontproto U xsrc/external/mit/xorgproto/dist/resproto.txt U xsrc/external/mit/xorgproto/dist/xcmiscproto.pc.in U xsrc/external/mit/xorgproto/dist/COPYING-glproto U xsrc/external/mit/xorgproto/dist/meson_options.txt U xsrc/external/mit/xorgproto/dist/PM_spec U xsrc/external/mit/xorgproto/dist/COPYING-dmxproto U xsrc/external/mit/xorgproto/dist/compositeproto.txt U xsrc/external/mit/xorgproto/dist/config.guess U xsrc/external/mit/xorgproto/dist/COPYING-xineramaproto U xsrc/external/mit/xorgproto/dist/install-sh U xsrc/external/mit/xorgproto/dist/COPYING-windowswmproto U xsrc/external/mit/xorgproto/dist/missing U xsrc/external/mit/xorgproto/dist/videoproto.pc.in U xsrc/external/mit/xorgproto/dist/xcalibrateproto.pc.in U xsrc/external/mit/xorgproto/dist/COPYING-fontcacheproto U xsrc/external/mit/xorgproto/dist/COPYING-randrproto U xsrc/external/mit/xorgproto/dist/trapproto.pc.in U xsrc/external/mit/xorgproto/dist/COPYING-fontsproto U xsrc/external/mit/xorgproto/dist/evieproto.pc.in U xsrc/external/mit/xorgproto/dist/compositeproto.pc.in U xsrc/external/mit/xorgproto/dist/COPYING-xf86rushproto U xsrc/external/mit/xorgproto/dist/Makefile.am U xsrc/external/mit/xorgproto/dist/xf86driproto.pc.in U xsrc/external/mit/xorgproto/dist/COPYING-dri2proto U xsrc/external/mit/xorgproto/dist/COPYING-printproto U xsrc/external/mit/xorgproto/dist/dri2proto.pc.in U xsrc/external/mit/xorgproto/dist/INSTALL U xsrc/external/mit/xorgproto/dist/randrproto.txt U xsrc/external/mit/xorgproto/dist/compile U
CVS commit: xsrc/external/mit
Module Name:xsrc
Committed By: mrg
Date: Sat Jul 10 23:28:58 UTC 2021
Modified Files:
xsrc/external/mit/libX11/dist/src: Font.c FontNames.c SetFPath.c
Removed Files:
xsrc/external/mit/libX11/dist/m4: libtool.m4 ltoptions.m4 ltsugar.m4
ltversion.m4 lt~obsolete.m4
xsrc/external/mit/libXfixes/dist: README
Log Message:
merge libX11 1.7.2, and libXfixes 6.0.0.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r0 xsrc/external/mit/libX11/dist/m4/libtool.m4
cvs rdiff -u -r1.4 -r0 xsrc/external/mit/libX11/dist/m4/ltoptions.m4 \
xsrc/external/mit/libX11/dist/m4/ltsugar.m4 \
xsrc/external/mit/libX11/dist/m4/ltversion.m4 \
xsrc/external/mit/libX11/dist/m4/lt~obsolete.m4
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libX11/dist/src/Font.c
cvs rdiff -u -r1.10 -r1.11 xsrc/external/mit/libX11/dist/src/FontNames.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libX11/dist/src/SetFPath.c
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXfixes/dist/README
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libX11/dist/src/Font.c
diff -u xsrc/external/mit/libX11/dist/src/Font.c:1.8 xsrc/external/mit/libX11/dist/src/Font.c:1.9
--- xsrc/external/mit/libX11/dist/src/Font.c:1.8 Wed May 19 08:20:08 2021
+++ xsrc/external/mit/libX11/dist/src/Font.c Sat Jul 10 23:28:58 2021
@@ -102,7 +102,7 @@ XFontStruct *XLoadQueryFont(
XF86BigfontCodes *extcodes = _XF86BigfontCodes(dpy);
#endif
-if (strlen(name) >= USHRT_MAX)
+if (name != NULL && strlen(name) >= USHRT_MAX)
return NULL;
if (_XF86LoadQueryLocaleFont(dpy, name, _result, (Font *)0))
return font_result;
@@ -656,7 +656,7 @@ int _XF86LoadQueryLocaleFont(
XFontStruct **xfp,
Font *fidp)
{
-int l;
+size_t l;
const char *charset, *p;
char buf[256];
XFontStruct *fs;
@@ -664,7 +664,7 @@ int _XF86LoadQueryLocaleFont(
if (!name)
return 0;
-l = (int) strlen(name);
+l = strlen(name);
if (l < 2 || name[l - 1] != '*' || name[l - 2] != '-' || l >= USHRT_MAX)
return 0;
charset = NULL;
@@ -677,11 +677,11 @@ int _XF86LoadQueryLocaleFont(
charset = "ISO8859-1";
p = charset + 7;
}
-if (l - 2 - (p - charset) < 0)
+if (l - 2 < p - charset)
return 0;
if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
return 0;
-if (strlen(p + 1) + (size_t) l - 1 >= sizeof(buf) - 1)
+if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
return 0;
strcpy(buf, name);
strcpy(buf + l - 1, p + 1);
Index: xsrc/external/mit/libX11/dist/src/FontNames.c
diff -u xsrc/external/mit/libX11/dist/src/FontNames.c:1.10 xsrc/external/mit/libX11/dist/src/FontNames.c:1.11
--- xsrc/external/mit/libX11/dist/src/FontNames.c:1.10 Wed May 19 08:20:08 2021
+++ xsrc/external/mit/libX11/dist/src/FontNames.c Sat Jul 10 23:28:58 2021
@@ -51,7 +51,7 @@ int *actualCount) /* RETURN */
register xListFontsReq *req;
unsigned long rlen = 0;
-if (strlen(pattern) >= USHRT_MAX)
+if (pattern != NULL && strlen(pattern) >= USHRT_MAX)
return NULL;
LockDisplay(dpy);
Index: xsrc/external/mit/libX11/dist/src/SetFPath.c
diff -u xsrc/external/mit/libX11/dist/src/SetFPath.c:1.2 xsrc/external/mit/libX11/dist/src/SetFPath.c:1.3
--- xsrc/external/mit/libX11/dist/src/SetFPath.c:1.2 Wed May 19 08:28:15 2021
+++ xsrc/external/mit/libX11/dist/src/SetFPath.c Sat Jul 10 23:28:58 2021
@@ -38,7 +38,7 @@ XSetFontPath (
char **directories,
int ndirs)
{
- register int n = 0;
+ register size_t n = 0;
register int i;
register int nbytes;
char *p;
@@ -49,7 +49,7 @@ XSetFontPath (
GetReq (SetFontPath, req);
req->nFonts = ndirs;
for (i = 0; i < ndirs; i++) {
- n = (int) ((size_t) n + (safestrlen (directories[i]) + 1));
+ n = n + (safestrlen (directories[i]) + 1);
if (n >= USHRT_MAX) {
UnlockDisplay(dpy);
SyncHandle();
@@ -65,9 +65,9 @@ XSetFontPath (
char *tmp = p;
for (i = 0; i < ndirs; i++) {
- register int length = (int) safestrlen (directories[i]);
+ size_t length = safestrlen (directories[i]);
*p = length;
- memcpy (p + 1, directories[i], (size_t)length);
+ memcpy (p + 1, directories[i], length);
p += length + 1;
}
Data (dpy, tmp, nbytes);
CVS import: xsrc/external/mit/libX11/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 10 23:20:27 UTC 2021 Update of /cvsroot/xsrc/external/mit/libX11/dist In directory ivanova.netbsd.org:/tmp/cvs-serv8089 Log Message: initial import of libX11-1.7.2 Status: Vendor Tag: xorg Release Tags: libX11-1-7-2 U xsrc/external/mit/libX11/dist/Makefile.in U xsrc/external/mit/libX11/dist/configure.ac U xsrc/external/mit/libX11/dist/configure U xsrc/external/mit/libX11/dist/compile U xsrc/external/mit/libX11/dist/ChangeLog U xsrc/external/mit/libX11/dist/config.guess U xsrc/external/mit/libX11/dist/x11-xcb.pc.in U xsrc/external/mit/libX11/dist/cpprules.in U xsrc/external/mit/libX11/dist/aclocal.m4 U xsrc/external/mit/libX11/dist/INSTALL U xsrc/external/mit/libX11/dist/Makefile.am U xsrc/external/mit/libX11/dist/missing U xsrc/external/mit/libX11/dist/depcomp U xsrc/external/mit/libX11/dist/test-driver U xsrc/external/mit/libX11/dist/README.md U xsrc/external/mit/libX11/dist/install-sh U xsrc/external/mit/libX11/dist/config.sub U xsrc/external/mit/libX11/dist/ltmain.sh U xsrc/external/mit/libX11/dist/NEWS U xsrc/external/mit/libX11/dist/COPYING U xsrc/external/mit/libX11/dist/x11.pc.in U xsrc/external/mit/libX11/dist/AUTHORS U xsrc/external/mit/libX11/dist/docbook.am U xsrc/external/mit/libX11/dist/include/Makefile.am U xsrc/external/mit/libX11/dist/include/Makefile.in U xsrc/external/mit/libX11/dist/include/X11/Xlibint.h U xsrc/external/mit/libX11/dist/include/X11/Xlib-xcb.h U xsrc/external/mit/libX11/dist/include/X11/Xlocale.h U xsrc/external/mit/libX11/dist/include/X11/XlibConf.h.in U xsrc/external/mit/libX11/dist/include/X11/Xresource.h U xsrc/external/mit/libX11/dist/include/X11/Xcms.h U xsrc/external/mit/libX11/dist/include/X11/Xlib.h U xsrc/external/mit/libX11/dist/include/X11/cursorfont.h U xsrc/external/mit/libX11/dist/include/X11/ImUtil.h U xsrc/external/mit/libX11/dist/include/X11/Xutil.h U xsrc/external/mit/libX11/dist/include/X11/XKBlib.h U xsrc/external/mit/libX11/dist/include/X11/Xregion.h U xsrc/external/mit/libX11/dist/include/X11/extensions/XKBgeom.h U xsrc/external/mit/libX11/dist/specs/Makefile.am U xsrc/external/mit/libX11/dist/specs/Makefile.in U xsrc/external/mit/libX11/dist/specs/i18n/Makefile.am U xsrc/external/mit/libX11/dist/specs/i18n/Makefile.in U xsrc/external/mit/libX11/dist/specs/i18n/framework/framework.xml U xsrc/external/mit/libX11/dist/specs/i18n/framework/Makefile.am U xsrc/external/mit/libX11/dist/specs/i18n/framework/framework.svg U xsrc/external/mit/libX11/dist/specs/i18n/framework/Makefile.in U xsrc/external/mit/libX11/dist/specs/i18n/compose/compose-chart.pl U xsrc/external/mit/libX11/dist/specs/i18n/compose/docbook-nl.am U xsrc/external/mit/libX11/dist/specs/i18n/compose/Makefile.am U xsrc/external/mit/libX11/dist/specs/i18n/compose/Makefile.in U xsrc/external/mit/libX11/dist/specs/i18n/localedb/Makefile.in U xsrc/external/mit/libX11/dist/specs/i18n/localedb/localedb.xml U xsrc/external/mit/libX11/dist/specs/i18n/localedb/Makefile.am U xsrc/external/mit/libX11/dist/specs/i18n/trans/trans.xml U xsrc/external/mit/libX11/dist/specs/i18n/trans/Makefile.in U xsrc/external/mit/libX11/dist/specs/i18n/trans/Makefile.am U xsrc/external/mit/libX11/dist/specs/libX11/CH03.xml U xsrc/external/mit/libX11/dist/specs/libX11/CH04.xml U xsrc/external/mit/libX11/dist/specs/libX11/CH15.xml U xsrc/external/mit/libX11/dist/specs/libX11/CH12.xml U xsrc/external/mit/libX11/dist/specs/libX11/AppC.xml U xsrc/external/mit/libX11/dist/specs/libX11/AppD.xml U xsrc/external/mit/libX11/dist/specs/libX11/CH05.xml U xsrc/external/mit/libX11/dist/specs/libX11/CH02.xml U xsrc/external/mit/libX11/dist/specs/libX11/AppB.xml U xsrc/external/mit/libX11/dist/specs/libX11/CH13.xml U xsrc/external/mit/libX11/dist/specs/libX11/CH14.xml U xsrc/external/mit/libX11/dist/specs/libX11/credits.xml U xsrc/external/mit/libX11/dist/specs/libX11/AppA.xml U xsrc/external/mit/libX11/dist/specs/libX11/CH10.xml U xsrc/external/mit/libX11/dist/specs/libX11/CH08.xml U xsrc/external/mit/libX11/dist/specs/libX11/Makefile.am U xsrc/external/mit/libX11/dist/specs/libX11/CH01.xml U xsrc/external/mit/libX11/dist/specs/libX11/CH06.xml U xsrc/external/mit/libX11/dist/specs/libX11/libX11.xml U xsrc/external/mit/libX11/dist/specs/libX11/CH11.xml U xsrc/external/mit/libX11/dist/specs/libX11/CH16.xml U xsrc/external/mit/libX11/dist/specs/libX11/Makefile.in U xsrc/external/mit/libX11/dist/specs/libX11/glossary.xml U xsrc/external/mit/libX11/dist/specs/libX11/CH07.xml U xsrc/external/mit/libX11/dist/specs/libX11/CH09.xml U xsrc/external/mit/libX11/dist/specs/XKB/ch19.xml U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-14.svg U xsrc/external/mit/libX11/dist/specs/XKB/ch10.xml U xsrc/external/mit/libX11/dist/specs/XKB/ch17.xml U xsrc/external/mit/libX11/dist/specs/XKB/Makefile.am U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-13.svg U xsrc/external/mit/libX11/dist/specs/XKB/ch22.xml U xsrc/external/mit/libX11/dist/specs/XKB/XKBlib-21.svg U
CVS import: xsrc/external/mit/libXfixes/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 10 23:20:29 UTC 2021 Update of /cvsroot/xsrc/external/mit/libXfixes/dist In directory ivanova.netbsd.org:/tmp/cvs-serv19610 Log Message: initial import of libXfixes-6.0.0 Status: Vendor Tag: xorg Release Tags: libXfixes-6-0-0 U xsrc/external/mit/libXfixes/dist/configure U xsrc/external/mit/libXfixes/dist/config.sub U xsrc/external/mit/libXfixes/dist/configure.ac U xsrc/external/mit/libXfixes/dist/AUTHORS U xsrc/external/mit/libXfixes/dist/ChangeLog N xsrc/external/mit/libXfixes/dist/README.md U xsrc/external/mit/libXfixes/dist/aclocal.m4 U xsrc/external/mit/libXfixes/dist/Makefile.in U xsrc/external/mit/libXfixes/dist/ltmain.sh U xsrc/external/mit/libXfixes/dist/xfixes.pc.in U xsrc/external/mit/libXfixes/dist/COPYING U xsrc/external/mit/libXfixes/dist/config.guess U xsrc/external/mit/libXfixes/dist/install-sh U xsrc/external/mit/libXfixes/dist/missing U xsrc/external/mit/libXfixes/dist/Makefile.am U xsrc/external/mit/libXfixes/dist/depcomp U xsrc/external/mit/libXfixes/dist/INSTALL U xsrc/external/mit/libXfixes/dist/compile U xsrc/external/mit/libXfixes/dist/config.h.in U xsrc/external/mit/libXfixes/dist/include/X11/extensions/Xfixes.h U xsrc/external/mit/libXfixes/dist/src/SaveSet.c U xsrc/external/mit/libXfixes/dist/src/Cursor.c U xsrc/external/mit/libXfixes/dist/src/Xfixesint.h U xsrc/external/mit/libXfixes/dist/src/Makefile.in N xsrc/external/mit/libXfixes/dist/src/Disconnect.c U xsrc/external/mit/libXfixes/dist/src/Xfixes.c U xsrc/external/mit/libXfixes/dist/src/Selection.c U xsrc/external/mit/libXfixes/dist/src/Makefile.am U xsrc/external/mit/libXfixes/dist/src/Region.c U xsrc/external/mit/libXfixes/dist/man/Xfixes.man U xsrc/external/mit/libXfixes/dist/man/Makefile.in U xsrc/external/mit/libXfixes/dist/man/Makefile.am No conflicts created by this import
CVS import: xsrc/external/mit/fonttosfnt/dist
Module Name:xsrc Committed By: mrg Date: Sat Jul 10 23:20:16 UTC 2021 Update of /cvsroot/xsrc/external/mit/fonttosfnt/dist In directory ivanova.netbsd.org:/tmp/cvs-serv5226 Log Message: initial import of fonttosfnt-1.2.2 Status: Vendor Tag: xorg Release Tags: fonttosfnt-1-2-2 U xsrc/external/mit/fonttosfnt/dist/configure U xsrc/external/mit/fonttosfnt/dist/config.sub U xsrc/external/mit/fonttosfnt/dist/configure.ac U xsrc/external/mit/fonttosfnt/dist/fonttosfnt.c U xsrc/external/mit/fonttosfnt/dist/env.c U xsrc/external/mit/fonttosfnt/dist/struct.c U xsrc/external/mit/fonttosfnt/dist/util.c U xsrc/external/mit/fonttosfnt/dist/ChangeLog U xsrc/external/mit/fonttosfnt/dist/README.md U xsrc/external/mit/fonttosfnt/dist/aclocal.m4 U xsrc/external/mit/fonttosfnt/dist/Makefile.in U xsrc/external/mit/fonttosfnt/dist/fonttosfnt.h U xsrc/external/mit/fonttosfnt/dist/COPYING U xsrc/external/mit/fonttosfnt/dist/config.guess U xsrc/external/mit/fonttosfnt/dist/install-sh U xsrc/external/mit/fonttosfnt/dist/missing U xsrc/external/mit/fonttosfnt/dist/Makefile.am U xsrc/external/mit/fonttosfnt/dist/depcomp U xsrc/external/mit/fonttosfnt/dist/INSTALL U xsrc/external/mit/fonttosfnt/dist/compile U xsrc/external/mit/fonttosfnt/dist/read.c U xsrc/external/mit/fonttosfnt/dist/write.c U xsrc/external/mit/fonttosfnt/dist/config.h.in U xsrc/external/mit/fonttosfnt/dist/man/fonttosfnt.man U xsrc/external/mit/fonttosfnt/dist/man/Makefile.in U xsrc/external/mit/fonttosfnt/dist/man/Makefile.am No conflicts created by this import
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sat Jul 10 22:46:02 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: decl_struct_member.c
decl_struct_member.exp
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: fix parsing of __attribute__ for member (since 2021-07-10)
Since cgram.y 1.280 from 2021-07-10, lint could not parse struct members
that have multiple __attribute__ in front of their type.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/decl_struct_member.c
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/decl_struct_member.exp
cvs rdiff -u -r1.304 -r1.305 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/decl_struct_member.c
diff -u src/tests/usr.bin/xlint/lint1/decl_struct_member.c:1.4 src/tests/usr.bin/xlint/lint1/decl_struct_member.c:1.5
--- src/tests/usr.bin/xlint/lint1/decl_struct_member.c:1.4 Sat Jul 10 22:34:02 2021
+++ src/tests/usr.bin/xlint/lint1/decl_struct_member.c Sat Jul 10 22:46:02 2021
@@ -1,9 +1,8 @@
-/* $NetBSD: decl_struct_member.c,v 1.4 2021/07/10 22:34:02 rillig Exp $ */
+/* $NetBSD: decl_struct_member.c,v 1.5 2021/07/10 22:46:02 rillig Exp $ */
# 3 "decl_struct_member.c"
struct multi_attributes {
__attribute__((deprecated))
- /* expect+1: error: syntax error '__attribute__' [249] */
__attribute__((deprecated))
__attribute__((deprecated))
int deprecated;
Index: src/tests/usr.bin/xlint/lint1/decl_struct_member.exp
diff -u src/tests/usr.bin/xlint/lint1/decl_struct_member.exp:1.3 src/tests/usr.bin/xlint/lint1/decl_struct_member.exp:1.4
--- src/tests/usr.bin/xlint/lint1/decl_struct_member.exp:1.3 Sat Jul 10 22:34:02 2021
+++ src/tests/usr.bin/xlint/lint1/decl_struct_member.exp Sat Jul 10 22:46:02 2021
@@ -1,5 +1,4 @@
-decl_struct_member.c(7): error: syntax error '__attribute__' [249]
-decl_struct_member.c(18): error: syntax error 'unnamed member' [249]
-decl_struct_member.c(25): error: syntax error '0' [249]
-decl_struct_member.c(26): warning: syntax requires ';' after last struct/union member [66]
-decl_struct_member.c(33): error: cannot recover from previous errors [224]
+decl_struct_member.c(17): error: syntax error 'unnamed member' [249]
+decl_struct_member.c(24): error: syntax error '0' [249]
+decl_struct_member.c(25): warning: syntax requires ';' after last struct/union member [66]
+decl_struct_member.c(32): error: cannot recover from previous errors [224]
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.304 src/usr.bin/xlint/lint1/cgram.y:1.305
--- src/usr.bin/xlint/lint1/cgram.y:1.304 Sat Jul 10 21:44:51 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 22:46:02 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.304 2021/07/10 21:44:51 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.305 2021/07/10 22:46:02 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.304 2021/07/10 21:44:51 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.305 2021/07/10 22:46:02 rillig Exp $");
#endif
#include
@@ -124,7 +124,7 @@ anonymize(sym_t *s)
%}
-%expect 136
+%expect 131
%union {
val_t *y_val;
@@ -715,7 +715,7 @@ struct_declaration:
noclass_declspecs:
noclass_declspecs_postfix
- | type_attribute noclass_declspecs_postfix
+ | type_attribute noclass_declspecs
;
noclass_declspecs_postfix:
CVS commit: src/external/gpl3/gcc/dist/libsanitizer/asan
Module Name:src
Committed By: mrg
Date: Sat Jul 10 22:39:56 UTC 2021
Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/asan: asan_linux.cc
Log Message:
remove an old #if 0'd section.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc:1.15 src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc:1.16
--- src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc:1.15 Sun Apr 11 23:54:25 2021
+++ src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc Sat Jul 10 22:39:56 2021
@@ -234,139 +234,6 @@ void AsanCheckIncompatibleRT() {
}
#endif // SANITIZER_ANDROID
-#if 0 // was in old netbsd / gcc 5 sanitizer stuff
-void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) {
-#ifdef __NetBSD__
-# define __UC_MACHINE_FP(ucontext, r) \
-(ucontext)->uc_mcontext.__gregs[(r)]
-/*
- * Unfortunately we don't have a portable frame pointer (yet)
- */
-# if defined(__alpha__)
-# define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_S6)
-# elif defined(__arm__)
-# define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_FP)
-# elif defined(__x86_64__)
-# define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_RBP)
-# elif defined(__i386__)
-# define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_EBP)
-# elif defined(__m68k__)
-# define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_A6)
-# elif defined(__mips__)
-# define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_S8)
-# elif defined(__powerpc__) || defined(__powerpc64__)
-# define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_R1)
-# elif defined(__riscv__)
-# define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_S0)
-# elif defined(__sparc__)
-# define _UC_MACHINE_FP(ucontext) sp[15]
-# elif defined(__sh3__)
-# define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_R14)
-# elif defined(__vax__)
-# define _UC_MACHINE_FP(ucontext) __UC_MACHINE_FP(ucontext, _REG_FP)
-# else
-# define _UC_MACHINE_FP(ucontext) 0
-# endif
- ucontext_t *ucontext = (ucontext_t*)context;
- *pc = _UC_MACHINE_PC(ucontext);
- *sp = _UC_MACHINE_SP(ucontext);
- *bp = _UC_MACHINE_FP(ucontext);
-#elif ASAN_ANDROID
- *pc = *sp = *bp = 0;
-#elif defined(__arm__)
- ucontext_t *ucontext = (ucontext_t*)context;
- *pc = ucontext->uc_mcontext.arm_pc;
- *bp = ucontext->uc_mcontext.arm_fp;
- *sp = ucontext->uc_mcontext.arm_sp;
-#elif defined(__aarch64__)
- ucontext_t *ucontext = (ucontext_t*)context;
- *pc = ucontext->uc_mcontext.pc;
- *bp = ucontext->uc_mcontext.regs[29];
- *sp = ucontext->uc_mcontext.sp;
-#elif defined(__hppa__)
- ucontext_t *ucontext = (ucontext_t*)context;
- *pc = ucontext->uc_mcontext.sc_iaoq[0];
- /* GCC uses %r3 whenever a frame pointer is needed. */
- *bp = ucontext->uc_mcontext.sc_gr[3];
- *sp = ucontext->uc_mcontext.sc_gr[30];
-#elif defined(__x86_64__)
-# if SANITIZER_FREEBSD
- ucontext_t *ucontext = (ucontext_t*)context;
- *pc = ucontext->uc_mcontext.mc_rip;
- *bp = ucontext->uc_mcontext.mc_rbp;
- *sp = ucontext->uc_mcontext.mc_rsp;
-# elif SANITIZER_NETBSD
- *pc = ucontext->uc_mcontext.__gregs[_REG_RIP];
- *bp = ucontext->uc_mcontext.__gregs[_REG_RBP];
- *sp = ucontext->uc_mcontext.__gregs[_REG_RSP];
-# else
- ucontext_t *ucontext = (ucontext_t*)context;
- *pc = ucontext->uc_mcontext.gregs[REG_RIP];
- *bp = ucontext->uc_mcontext.gregs[REG_RBP];
- *sp = ucontext->uc_mcontext.gregs[REG_RSP];
-# endif
-#elif defined(__i386__)
-# if SANITIZER_FREEBSD
- ucontext_t *ucontext = (ucontext_t*)context;
- *pc = ucontext->uc_mcontext.mc_eip;
- *bp = ucontext->uc_mcontext.mc_ebp;
- *sp = ucontext->uc_mcontext.mc_esp;
-# elif SANITIZER_FREEBSD
- ucontext_t *ucontext = (ucontext_t*)context;
- *pc = ucontext->uc_mcontext.__gregs[_REG_EIP];
- *bp = ucontext->uc_mcontext.__gregs[_REG_EBP];
- *sp = ucontext->uc_mcontext.__gregs[_REG_ESP];
-# else
- ucontext_t *ucontext = (ucontext_t*)context;
- *pc = ucontext->uc_mcontext.gregs[REG_EIP];
- *bp = ucontext->uc_mcontext.gregs[REG_EBP];
- *sp = ucontext->uc_mcontext.gregs[REG_ESP];
-# endif
-#elif defined(__powerpc__) || defined(__powerpc64__)
- ucontext_t *ucontext = (ucontext_t*)context;
- *pc = ucontext->uc_mcontext.regs->nip;
- *sp = ucontext->uc_mcontext.regs->gpr[PT_R1];
- // The powerpc{,64}-linux ABIs do not specify r31 as the frame
- // pointer, but GCC always uses r31 when we need a frame pointer.
- *bp = ucontext->uc_mcontext.regs->gpr[PT_R31];
-#elif defined(__riscv__)
- ucontext_t *ucontext = (ucontext_t*)context;
- *pc = ucontext->uc_mcontext.gregs[REG_PC];
- *bp = ucontext->uc_mcontext.gregs[REG_S0];
- *sp =
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 22:34:02 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: decl_struct_member.c
decl_struct_member.exp
Log Message:
tests/lint: demonstrate parse error for __attribute__ member
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/decl_struct_member.c
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/decl_struct_member.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/decl_struct_member.c
diff -u src/tests/usr.bin/xlint/lint1/decl_struct_member.c:1.3 src/tests/usr.bin/xlint/lint1/decl_struct_member.c:1.4
--- src/tests/usr.bin/xlint/lint1/decl_struct_member.c:1.3 Sat Jul 10 17:35:54 2021
+++ src/tests/usr.bin/xlint/lint1/decl_struct_member.c Sat Jul 10 22:34:02 2021
@@ -1,12 +1,19 @@
-/* $NetBSD: decl_struct_member.c,v 1.3 2021/07/10 17:35:54 rillig Exp $ */
+/* $NetBSD: decl_struct_member.c,v 1.4 2021/07/10 22:34:02 rillig Exp $ */
# 3 "decl_struct_member.c"
+struct multi_attributes {
+ __attribute__((deprecated))
+ /* expect+1: error: syntax error '__attribute__' [249] */
+ __attribute__((deprecated))
+ __attribute__((deprecated))
+ int deprecated;
+};
+
/*
* Before cgram.y 1.228 from 2021-06-19, lint ran into an assertion failure:
*
* "is_struct_or_union(dcs->d_type->t_tspec)" at cgram.y:846
*/
-
struct {
char; /* expect: syntax error 'unnamed member' */
};
Index: src/tests/usr.bin/xlint/lint1/decl_struct_member.exp
diff -u src/tests/usr.bin/xlint/lint1/decl_struct_member.exp:1.2 src/tests/usr.bin/xlint/lint1/decl_struct_member.exp:1.3
--- src/tests/usr.bin/xlint/lint1/decl_struct_member.exp:1.2 Sun Jun 20 11:24:32 2021
+++ src/tests/usr.bin/xlint/lint1/decl_struct_member.exp Sat Jul 10 22:34:02 2021
@@ -1,4 +1,5 @@
-decl_struct_member.c(11): error: syntax error 'unnamed member' [249]
-decl_struct_member.c(18): error: syntax error '0' [249]
-decl_struct_member.c(19): warning: syntax requires ';' after last struct/union member [66]
-decl_struct_member.c(26): error: cannot recover from previous errors [224]
+decl_struct_member.c(7): error: syntax error '__attribute__' [249]
+decl_struct_member.c(18): error: syntax error 'unnamed member' [249]
+decl_struct_member.c(25): error: syntax error '0' [249]
+decl_struct_member.c(26): warning: syntax requires ';' after last struct/union member [66]
+decl_struct_member.c(33): error: cannot recover from previous errors [224]
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 21:44:51 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: inline grammar rules declmod and qualifier_or_storage_class
The rule declmod had a confusing name since declmods was not exactly a
list of declmod.
Inlining the rules reduces the abstraction level. There are still some
shift/reduce conflicts in that area, so make the rules as simple as
possible, in order to resolve these conflicts.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.303 -r1.304 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.303 src/usr.bin/xlint/lint1/cgram.y:1.304
--- src/usr.bin/xlint/lint1/cgram.y:1.303 Sat Jul 10 21:08:16 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 21:44:51 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.303 2021/07/10 21:08:16 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.304 2021/07/10 21:44:51 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.303 2021/07/10 21:08:16 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.304 2021/07/10 21:44:51 rillig Exp $");
#endif
#include
@@ -535,23 +535,22 @@ declaration_specifiers: /* C99 6.7 */
add_type_specifier
| declmods add_type_specifier
| type_attribute declaration_specifiers
- | declaration_specifiers declmod
+ | declaration_specifiers add_storage_class
| declaration_specifiers add_notype_type_specifier
+ | declaration_specifiers add_type_qualifier
+ | declaration_specifiers type_attribute
;
declmods:
- qualifier_or_storage_class
- | declmods declmod
+ add_storage_class
+ | add_type_qualifier
+ | declmods add_storage_class
+ | declmods add_type_qualifier
+ | declmods type_attribute
;
-declmod:
- qualifier_or_storage_class
- | type_attribute
- ;
-
-qualifier_or_storage_class:
- add_type_qualifier
- | T_SCLASS {
+add_storage_class:
+ T_SCLASS {
add_storage_class($1);
}
;
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 21:08:16 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: merge duplicate code for struct and enum declarations
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.302 -r1.303 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.302 src/usr.bin/xlint/lint1/cgram.y:1.303
--- src/usr.bin/xlint/lint1/cgram.y:1.302 Sat Jul 10 20:58:35 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 21:08:16 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.302 2021/07/10 20:58:35 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.303 2021/07/10 21:08:16 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.302 2021/07/10 20:58:35 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.303 2021/07/10 21:08:16 rillig Exp $");
#endif
#include
@@ -286,7 +286,7 @@ anonymize(sym_t *s)
%type struct_or_union_specifier
%type enum_specifier
%type struct_or_union
-%type braced_struct_declaration_list
+%type identifier_sym_opt
%type identifier_sym
%type identifier
%type struct_declaration_list_semi
@@ -298,7 +298,6 @@ anonymize(sym_t *s)
%type type_member_decl
%type constant_expr
%type array_size
-%type enum_declaration
%type enumerator_list
%type enumerator
%type notype_direct_decl
@@ -629,15 +628,12 @@ struct_or_union_specifier: /* C99 6.7.2.
*/
$$ = mktag($2, $1, false, yychar == T_SEMI);
}
- | struct_or_union identifier_sym {
+ | struct_or_union identifier_sym_opt {
dcs->d_tagtyp = mktag($2, $1, true, false);
- } braced_struct_declaration_list {
- $$ = complete_tag_struct_or_union(dcs->d_tagtyp, $4);
- }
- | struct_or_union {
- dcs->d_tagtyp = mktag(NULL, $1, true, false);
- } braced_struct_declaration_list {
- $$ = complete_tag_struct_or_union(dcs->d_tagtyp, $3);
+ } T_LBRACE {
+ symtyp = FVFT;
+ } struct_declaration_list_semi T_RBRACE {
+ $$ = complete_tag_struct_or_union(dcs->d_tagtyp, $6);
}
| struct_or_union error {
symtyp = FVFT;
@@ -654,14 +650,6 @@ struct_or_union: /* C99 6.7.2.1 */
} type_attribute_list_opt
;
-braced_struct_declaration_list:
- T_LBRACE {
- symtyp = FVFT;
- } struct_declaration_list_semi T_RBRACE {
- $$ = $3;
- }
- ;
-
struct_declaration_list_semi:
/* empty */ {
$$ = NULL;
@@ -800,15 +788,13 @@ enum_specifier: /* C99 6.7.2.2 */
enum identifier_sym {
$$ = mktag($2, ENUM, false, false);
}
- | enum identifier_sym {
+ | enum identifier_sym_opt {
dcs->d_tagtyp = mktag($2, ENUM, true, false);
- } enum_declaration {
- $$ = complete_tag_enum(dcs->d_tagtyp, $4);
- }
- | enum {
- dcs->d_tagtyp = mktag(NULL, ENUM, true, false);
- } enum_declaration {
- $$ = complete_tag_enum(dcs->d_tagtyp, $3);
+ } T_LBRACE {
+ symtyp = FVFT;
+ enumval = 0;
+ } enumerator_list enumerator_list_comma_opt T_RBRACE {
+ $$ = complete_tag_enum(dcs->d_tagtyp, $6);
}
| enum error {
symtyp = FVFT;
@@ -823,15 +809,6 @@ enum:
}
;
-enum_declaration:
- T_LBRACE {
- symtyp = FVFT;
- enumval = 0;
- } enumerator_list enumerator_list_comma_opt T_RBRACE {
- $$ = $3;
- }
- ;
-
enumerator_list: /* C99 6.7.2.2 */
enumerator
| enumerator_list T_COMMA enumerator {
@@ -1901,6 +1878,13 @@ point_or_arrow:
}
;
+identifier_sym_opt:
+ /* empty */ {
+ $$ = NULL;
+ }
+ | identifier_sym
+ ;
+
identifier_sym:
identifier {
$$ = getsym($1);
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 20:58:35 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: move type_attribute back into the main section
Type attributes are a standard feature since C11 and thus do not belong
in the GCC-specific section. Only the GCC __attribute__ belongs there.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.301 -r1.302 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.301 src/usr.bin/xlint/lint1/cgram.y:1.302
--- src/usr.bin/xlint/lint1/cgram.y:1.301 Sat Jul 10 20:44:23 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 20:58:35 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.301 2021/07/10 20:44:23 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.302 2021/07/10 20:58:35 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.301 2021/07/10 20:44:23 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.302 2021/07/10 20:58:35 rillig Exp $");
#endif
#include
@@ -563,6 +563,30 @@ add_type_specifier:
}
;
+type_attribute_list_opt:
+ /* empty */
+ | type_attribute_list
+ ;
+
+type_attribute_list:
+ type_attribute
+ | type_attribute_list type_attribute
+ ;
+
+type_attribute_opt:
+ /* empty */
+ | type_attribute
+ ;
+
+type_attribute: /* See C11 6.7 declaration-specifiers */
+ gcc_attribute
+ | T_ALIGNAS T_LPAREN align_as T_RPAREN
+ | T_PACKED {
+ addpacked();
+ }
+ | T_NORETURN
+ ;
+
type_specifier: /* C99 6.7.2 */
notype_type_specifier
| T_TYPENAME {
@@ -1901,30 +1925,6 @@ comma_opt:
/* GCC extensions */
-type_attribute_list_opt:
- /* empty */
- | type_attribute_list
- ;
-
-type_attribute_list:
- type_attribute
- | type_attribute_list type_attribute
- ;
-
-type_attribute_opt:
- /* empty */
- | type_attribute
- ;
-
-type_attribute:
- gcc_attribute
- | T_ALIGNAS T_LPAREN align_as T_RPAREN
- | T_PACKED {
- addpacked();
- }
- | T_NORETURN
- ;
-
gcc_attribute_list_opt:
/* empty */
| gcc_attribute_list
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 20:44:24 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: merge duplicate code for struct and enum tags
This is a tricky area. Inlining identifier_sym did not work because of
the side-effects of getsym. In situations where two identifiers of
different kinds follow each other, such as 'enum id1 id2', the timing is
crucial, and inlining identifier_sym would have led to an internal error
in getsym. The symbol type has to be reset from FTAG to FVFT before
reading the next token.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.300 -r1.301 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.300 src/usr.bin/xlint/lint1/cgram.y:1.301
--- src/usr.bin/xlint/lint1/cgram.y:1.300 Sat Jul 10 19:29:28 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 20:44:23 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.300 2021/07/10 19:29:28 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.301 2021/07/10 20:44:23 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.300 2021/07/10 19:29:28 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.301 2021/07/10 20:44:23 rillig Exp $");
#endif
#include
@@ -285,10 +285,9 @@ anonymize(sym_t *s)
%type notype_type_specifier
%type struct_or_union_specifier
%type enum_specifier
-%type struct_tag
-%type enum_tag
%type struct_or_union
%type braced_struct_declaration_list
+%type identifier_sym
%type identifier
%type struct_declaration_list_semi
%type struct_declaration_list
@@ -302,7 +301,6 @@ anonymize(sym_t *s)
%type enum_declaration
%type enumerator_list
%type enumerator
-%type enumeration_constant
%type notype_direct_decl
%type type_direct_decl
%type pointer
@@ -597,7 +595,7 @@ notype_type_specifier:
;
struct_or_union_specifier: /* C99 6.7.2.1 */
- struct_or_union struct_tag {
+ struct_or_union identifier_sym {
/*
* STDC requires that "struct a;" always introduces
* a new tag if "a" is not declared at current level
@@ -607,7 +605,7 @@ struct_or_union_specifier: /* C99 6.7.2.
*/
$$ = mktag($2, $1, false, yychar == T_SEMI);
}
- | struct_or_union struct_tag {
+ | struct_or_union identifier_sym {
dcs->d_tagtyp = mktag($2, $1, true, false);
} braced_struct_declaration_list {
$$ = complete_tag_struct_or_union(dcs->d_tagtyp, $4);
@@ -632,12 +630,6 @@ struct_or_union: /* C99 6.7.2.1 */
} type_attribute_list_opt
;
-struct_tag:
- identifier {
- $$ = getsym($1);
- }
- ;
-
braced_struct_declaration_list:
T_LBRACE {
symtyp = FVFT;
@@ -781,10 +773,10 @@ type_member_decl:
;
enum_specifier: /* C99 6.7.2.2 */
- enum enum_tag {
+ enum identifier_sym {
$$ = mktag($2, ENUM, false, false);
}
- | enum enum_tag {
+ | enum identifier_sym {
dcs->d_tagtyp = mktag($2, ENUM, true, false);
} enum_declaration {
$$ = complete_tag_enum(dcs->d_tagtyp, $4);
@@ -807,12 +799,6 @@ enum:
}
;
-enum_tag:
- identifier {
- $$ = getsym($1);
- }
- ;
-
enum_declaration:
T_LBRACE {
symtyp = FVFT;
@@ -846,20 +832,14 @@ enumerator_list_comma_opt:
;
enumerator: /* C99 6.7.2.2 */
- enumeration_constant {
+ identifier_sym {
$$ = enumeration_constant($1, enumval, true);
}
- | enumeration_constant T_ASSIGN constant_expr {
+ | identifier_sym T_ASSIGN constant_expr {
$$ = enumeration_constant($1, to_int_constant($3, true), false);
}
;
-enumeration_constant: /* C99 6.4.4.3 */
- identifier {
- $$ = getsym($1);
- }
- ;
-
/*
* For an explanation of 'notype' in the following rules, see the Bison
@@ -1897,6 +1877,12 @@ point_or_arrow:
}
;
+identifier_sym:
+ identifier {
+ $$ = getsym($1);
+ }
+ ;
+
identifier: /* C99 6.4.2.1 */
T_NAME {
$$ = $1;
CVS commit: src/sys/arch/alpha/alpha
Module Name:src
Committed By: thorpej
Date: Sat Jul 10 20:22:38 UTC 2021
Modified Files:
src/sys/arch/alpha/alpha: pmap.c
Added Files:
src/sys/arch/alpha/alpha: pmap_subr.s
Log Message:
Move the optimized pmap_zero_page() from pmap.c to a new pmap_subr.s,
and optimize it a teeny bit little more. Provide an optimized (for 21164,
anyway) pmap_copy_page() as well.
To generate a diff of this commit:
cvs rdiff -u -r1.296 -r1.297 src/sys/arch/alpha/alpha/pmap.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/alpha/alpha/pmap_subr.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/alpha/pmap.c
diff -u src/sys/arch/alpha/alpha/pmap.c:1.296 src/sys/arch/alpha/alpha/pmap.c:1.297
--- src/sys/arch/alpha/alpha/pmap.c:1.296 Mon Jul 5 15:12:00 2021
+++ src/sys/arch/alpha/alpha/pmap.c Sat Jul 10 20:22:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.296 2021/07/05 15:12:00 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.297 2021/07/10 20:22:37 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001, 2007, 2008, 2020
@@ -135,7 +135,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.296 2021/07/05 15:12:00 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.297 2021/07/10 20:22:37 thorpej Exp $");
#include
#include
@@ -2758,85 +2758,9 @@ pmap_deactivate(struct lwp *l)
pmap_destroy(pmap);
}
-/*
- * pmap_zero_page: [ INTERFACE ]
- *
- * Zero the specified (machine independent) page by mapping the page
- * into virtual memory and clear its contents, one machine dependent
- * page at a time.
- *
- * Note: no locking is necessary in this function.
- */
-void
-pmap_zero_page(paddr_t phys)
-{
- u_long *p0, *p1, *pend;
-
-#ifdef DEBUG
- if (pmapdebug & PDB_FOLLOW)
- printf("pmap_zero_page(%lx)\n", phys);
-#endif
-
- p0 = (u_long *)ALPHA_PHYS_TO_K0SEG(phys);
- p1 = NULL;
- pend = (u_long *)((u_long)p0 + PAGE_SIZE);
-
- /*
- * Unroll the loop a bit, doing 16 quadwords per iteration.
- * Do only 8 back-to-back stores, and alternate registers.
- */
- do {
- __asm volatile(
- "# BEGIN loop body\n"
- " addq %2, (8 * 8), %1 \n"
- " stq $31, (0 * 8)(%0) \n"
- " stq $31, (1 * 8)(%0) \n"
- " stq $31, (2 * 8)(%0) \n"
- " stq $31, (3 * 8)(%0) \n"
- " stq $31, (4 * 8)(%0) \n"
- " stq $31, (5 * 8)(%0) \n"
- " stq $31, (6 * 8)(%0) \n"
- " stq $31, (7 * 8)(%0) \n"
- " \n"
- " addq %3, (8 * 8), %0 \n"
- " stq $31, (0 * 8)(%1) \n"
- " stq $31, (1 * 8)(%1) \n"
- " stq $31, (2 * 8)(%1) \n"
- " stq $31, (3 * 8)(%1) \n"
- " stq $31, (4 * 8)(%1) \n"
- " stq $31, (5 * 8)(%1) \n"
- " stq $31, (6 * 8)(%1) \n"
- " stq $31, (7 * 8)(%1) \n"
- " # END loop body"
- : "=r" (p0), "=r" (p1)
- : "0" (p0), "1" (p1)
- : "memory");
- } while (p0 < pend);
-}
-
-/*
- * pmap_copy_page: [ INTERFACE ]
- *
- * Copy the specified (machine independent) page by mapping the page
- * into virtual memory and using memcpy to copy the page, one machine
- * dependent page at a time.
- *
- * Note: no locking is necessary in this function.
- */
-void
-pmap_copy_page(paddr_t src, paddr_t dst)
-{
- const void *s;
- void *d;
+/* pmap_zero_page() is in pmap_subr.s */
-#ifdef DEBUG
- if (pmapdebug & PDB_FOLLOW)
- printf("pmap_copy_page(%lx, %lx)\n", src, dst);
-#endif
- s = (const void *)ALPHA_PHYS_TO_K0SEG(src);
- d = (void *)ALPHA_PHYS_TO_K0SEG(dst);
- memcpy(d, s, PAGE_SIZE);
-}
+/* pmap_copy_page() is in pmap_subr.s */
/*
* pmap_pageidlezero: [ INTERFACE ]
Added files:
Index: src/sys/arch/alpha/alpha/pmap_subr.s
diff -u /dev/null src/sys/arch/alpha/alpha/pmap_subr.s:1.1
--- /dev/null Sat Jul 10 20:22:38 2021
+++ src/sys/arch/alpha/alpha/pmap_subr.s Sat Jul 10 20:22:37 2021
@@ -0,0 +1,165 @@
+/* $NetBSD: pmap_subr.s,v 1.1 2021/07/10 20:22:37 thorpej Exp $ */
+
+/*-
+ * Copyright (c) 2021 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 19:30:19 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: decl.c decl.exp
Log Message:
tests/lint: test error handling in enum-specifier
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/decl.c \
src/tests/usr.bin/xlint/lint1/decl.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/decl.c
diff -u src/tests/usr.bin/xlint/lint1/decl.c:1.1 src/tests/usr.bin/xlint/lint1/decl.c:1.2
--- src/tests/usr.bin/xlint/lint1/decl.c:1.1 Sat Jul 10 18:25:57 2021
+++ src/tests/usr.bin/xlint/lint1/decl.c Sat Jul 10 19:30:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.1 2021/07/10 18:25:57 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.2 2021/07/10 19:30:19 rillig Exp $ */
# 3 "decl.c"
/*
@@ -71,3 +71,18 @@ declarators(void)
/* expect+1: converting 'pointer to pointer to char' to incompatible 'pointer to double' */
sink(ppc);
}
+
+_Bool
+enum_error_handling(void)
+{
+ enum {
+ /* expect+1: syntax error '"' [249] */
+ "error 1"
+ : /* still the same error */
+ , /* back on track */
+ A,
+ B
+ } x = A;
+
+ return x == B;
+}
Index: src/tests/usr.bin/xlint/lint1/decl.exp
diff -u src/tests/usr.bin/xlint/lint1/decl.exp:1.1 src/tests/usr.bin/xlint/lint1/decl.exp:1.2
--- src/tests/usr.bin/xlint/lint1/decl.exp:1.1 Sat Jul 10 18:25:57 2021
+++ src/tests/usr.bin/xlint/lint1/decl.exp Sat Jul 10 19:30:19 2021
@@ -8,3 +8,4 @@ decl.c(54): error: syntax error 'const'
decl.c(68): warning: converting 'pointer to char' to incompatible 'pointer to double' for argument 1 [153]
decl.c(70): warning: illegal combination of pointer (pointer to double) and integer (char), arg #1 [154]
decl.c(72): warning: converting 'pointer to pointer to char' to incompatible 'pointer to double' for argument 1 [153]
+decl.c(80): error: syntax error '"' [249]
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 19:29:28 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: rename grammar rules to align with C99
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.299 -r1.300 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.299 src/usr.bin/xlint/lint1/cgram.y:1.300
--- src/usr.bin/xlint/lint1/cgram.y:1.299 Sat Jul 10 18:56:54 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 19:29:28 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.299 2021/07/10 18:56:54 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.300 2021/07/10 19:29:28 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.299 2021/07/10 18:56:54 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.300 2021/07/10 19:29:28 rillig Exp $");
#endif
#include
@@ -281,18 +281,18 @@ anonymize(sym_t *s)
%type func_decl
%type notype_decl
%type type_decl
-%type typespec
-%type notype_typespec
-%type struct_spec
-%type enum_spec
+%type type_specifier
+%type notype_type_specifier
+%type struct_or_union_specifier
+%type enum_specifier
%type struct_tag
%type enum_tag
-%type struct
-%type struct_declaration
+%type struct_or_union
+%type braced_struct_declaration_list
%type identifier
-%type member_declaration_list_semi
-%type member_declaration_list
-%type member_declaration
+%type struct_declaration_list_semi
+%type struct_declaration_list
+%type struct_declaration
%type notype_member_decls
%type type_member_decls
%type notype_member_decl
@@ -535,11 +535,11 @@ end_type:
;
declaration_specifiers: /* C99 6.7 */
- add_typespec
- | declmods add_typespec
+ add_type_specifier
+ | declmods add_type_specifier
| type_attribute declaration_specifiers
| declaration_specifiers declmod
- | declaration_specifiers add_notype_typespec
+ | declaration_specifiers add_notype_type_specifier
;
declmods:
@@ -559,44 +559,45 @@ qualifier_or_storage_class:
}
;
-add_typespec:
- typespec {
+add_type_specifier:
+ type_specifier {
add_type($1);
}
;
-typespec:
- notype_typespec
+type_specifier: /* C99 6.7.2 */
+ notype_type_specifier
| T_TYPENAME {
$$ = getsym($1)->s_type;
}
;
-add_notype_typespec:
- notype_typespec {
+add_notype_type_specifier:
+ notype_type_specifier {
add_type($1);
}
;
-notype_typespec:
+/* Like type_specifier, but without typedef-name. */
+notype_type_specifier:
T_TYPE {
$$ = gettyp($1);
}
| T_TYPEOF term {
$$ = $2->tn_type;
}
- | struct_spec {
+ | struct_or_union_specifier {
end_declaration_level();
$$ = $1;
}
- | enum_spec {
+ | enum_specifier {
end_declaration_level();
$$ = $1;
}
;
-struct_spec:
- struct struct_tag {
+struct_or_union_specifier: /* C99 6.7.2.1 */
+ struct_or_union struct_tag {
/*
* STDC requires that "struct a;" always introduces
* a new tag if "a" is not declared at current level
@@ -606,23 +607,23 @@ struct_spec:
*/
$$ = mktag($2, $1, false, yychar == T_SEMI);
}
- | struct struct_tag {
+ | struct_or_union struct_tag {
dcs->d_tagtyp = mktag($2, $1, true, false);
- } struct_declaration {
+ } braced_struct_declaration_list {
$$ = complete_tag_struct_or_union(dcs->d_tagtyp, $4);
}
- | struct {
+ | struct_or_union {
dcs->d_tagtyp = mktag(NULL, $1, true, false);
- } struct_declaration {
+ } braced_struct_declaration_list {
$$ = complete_tag_struct_or_union(dcs->d_tagtyp, $3);
}
- | struct error {
+ | struct_or_union error {
symtyp = FVFT;
$$ = gettyp(INT);
}
;
-struct:
+struct_or_union: /* C99 6.7.2.1 */
T_STRUCT_OR_UNION {
symtyp = FTAG;
begin_declaration_level($1 == STRUCT ? MOS : MOU);
@@ -637,20 +638,20 @@ struct_tag:
}
;
-struct_declaration:
+braced_struct_declaration_list:
T_LBRACE {
symtyp = FVFT;
- } member_declaration_list_semi T_RBRACE {
+ } struct_declaration_list_semi T_RBRACE {
$$ = $3;
}
;
-member_declaration_list_semi:
+struct_declaration_list_semi:
/* empty */ {
$$ = NULL;
}
- | member_declaration_list T_SEMI
- | member_declaration_list {
+ | struct_declaration_list T_SEMI
+ | struct_declaration_list {
if (sflag) {
/* syntax req. ';' after last struct/union member */
error(66);
@@ -662,14 +663,14 @@ member_declaration_list_semi:
}
;
-member_declaration_list:
- member_declaration
- | member_declaration_list T_SEMI member_declaration {
+struct_declaration_list:
+ struct_declaration
+ | struct_declaration_list T_SEMI struct_declaration {
$$ = lnklst($1, $3);
}
;
-member_declaration:
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 18:56:55 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: merge duplicate code for typespec and notype_typespec
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.298 -r1.299 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.298 src/usr.bin/xlint/lint1/cgram.y:1.299
--- src/usr.bin/xlint/lint1/cgram.y:1.298 Sat Jul 10 18:13:06 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 18:56:54 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.298 2021/07/10 18:13:06 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.299 2021/07/10 18:56:54 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.298 2021/07/10 18:13:06 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.299 2021/07/10 18:56:54 rillig Exp $");
#endif
#include
@@ -535,17 +535,11 @@ end_type:
;
declaration_specifiers: /* C99 6.7 */
- typespec {
- add_type($1);
- }
- | declmods typespec {
- add_type($2);
- }
+ add_typespec
+ | declmods add_typespec
| type_attribute declaration_specifiers
| declaration_specifiers declmod
- | declaration_specifiers notype_typespec {
- add_type($2);
- }
+ | declaration_specifiers add_notype_typespec
;
declmods:
@@ -559,14 +553,18 @@ declmod:
;
qualifier_or_storage_class:
- T_QUAL {
- add_qualifier($1);
- }
+ add_type_qualifier
| T_SCLASS {
add_storage_class($1);
}
;
+add_typespec:
+ typespec {
+ add_type($1);
+ }
+ ;
+
typespec:
notype_typespec
| T_TYPENAME {
@@ -574,6 +572,12 @@ typespec:
}
;
+add_notype_typespec:
+ notype_typespec {
+ add_type($1);
+ }
+ ;
+
notype_typespec:
T_TYPE {
$$ = gettyp($1);
@@ -711,18 +715,10 @@ noclass_declspecs:
;
noclass_declspecs_postfix:
- typespec {
- add_type($1);
- }
- | add_type_qualifier_list typespec {
- add_type($2);
- }
- | noclass_declspecs_postfix T_QUAL {
- add_qualifier($2);
- }
- | noclass_declspecs_postfix notype_typespec {
- add_type($2);
- }
+ add_typespec
+ | add_type_qualifier_list add_typespec
+ | noclass_declspecs_postfix add_type_qualifier
+ | noclass_declspecs_postfix add_notype_typespec
| noclass_declspecs_postfix type_attribute
;
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 18:42:28 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: lex_integer.c
Log Message:
tests/lint: test lexing of integer suffixes
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/lex_integer.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/lex_integer.c
diff -u src/tests/usr.bin/xlint/lint1/lex_integer.c:1.4 src/tests/usr.bin/xlint/lint1/lex_integer.c:1.5
--- src/tests/usr.bin/xlint/lint1/lex_integer.c:1.4 Tue Jun 29 13:58:13 2021
+++ src/tests/usr.bin/xlint/lint1/lex_integer.c Sat Jul 10 18:42:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lex_integer.c,v 1.4 2021/06/29 13:58:13 rillig Exp $ */
+/* $NetBSD: lex_integer.c,v 1.5 2021/07/10 18:42:28 rillig Exp $ */
# 3 "lex_integer.c"
/*
@@ -43,3 +43,19 @@ test_unsigned_int(void)
/* expect+1: conversion of 'unsigned long' to 'unsigned int' is out of range */
sinku(4294967296U);
}
+
+void sinkull(unsigned long long);
+
+void
+suffixes(void)
+{
+ sinkull(3u);
+ sinkull(3ll);
+ sinkull(3llu);
+ sinkull(3Ull);
+
+ /* The 'LL' must not be split. Checked by the compiler. */
+ sinkull(3lul);
+ /* The 'Ll' must not used mixed case. Checked by the compiler. */
+ sinkull(3ULl);
+}
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 18:34:03 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: msg_083.c msg_083.exp
Log Message:
tests/lint: add another example for storage class in declaration
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/msg_083.c
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_083.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/msg_083.c
diff -u src/tests/usr.bin/xlint/lint1/msg_083.c:1.3 src/tests/usr.bin/xlint/lint1/msg_083.c:1.4
--- src/tests/usr.bin/xlint/lint1/msg_083.c:1.3 Sun Jan 31 11:12:07 2021
+++ src/tests/usr.bin/xlint/lint1/msg_083.c Sat Jul 10 18:34:03 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_083.c,v 1.3 2021/01/31 11:12:07 rillig Exp $ */
+/* $NetBSD: msg_083.c,v 1.4 2021/07/10 18:34:03 rillig Exp $ */
# 3 "msg_083.c"
// Test for message: storage class after type is obsolescent [83]
@@ -8,3 +8,8 @@ example(void)
{
int register x; /* expect: 83 */
}
+
+struct {
+ int member;
+} typedef s;
+/* expect-1: warning: storage class after type is obsolescent [83] */
Index: src/tests/usr.bin/xlint/lint1/msg_083.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_083.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_083.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_083.exp:1.2 Fri Jan 8 21:25:03 2021
+++ src/tests/usr.bin/xlint/lint1/msg_083.exp Sat Jul 10 18:34:03 2021
@@ -1 +1,2 @@
msg_083.c(9): warning: storage class after type is obsolescent [83]
+msg_083.c(14): warning: storage class after type is obsolescent [83]
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sat Jul 10 18:25:57 UTC 2021
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: Makefile
Added Files:
src/tests/usr.bin/xlint/lint1: decl.c decl.exp
Log Message:
tests/lint: test declarations
To generate a diff of this commit:
cvs rdiff -u -r1.1082 -r1.1083 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.83 -r1.84 src/tests/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/decl.c \
src/tests/usr.bin/xlint/lint1/decl.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1082 src/distrib/sets/lists/tests/mi:1.1083
--- src/distrib/sets/lists/tests/mi:1.1082 Sat Jul 10 09:24:26 2021
+++ src/distrib/sets/lists/tests/mi Sat Jul 10 18:25:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1082 2021/07/10 09:24:26 rillig Exp $
+# $NetBSD: mi,v 1.1083 2021/07/10 18:25:57 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6210,6 +6210,8 @@
./usr/tests/usr.bin/xlint/lint1/d_typefun.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/d_typename_as_var.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/d_zero_sized_arrays.c tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/decl.ctests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/decl.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/decl_arg.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/decl_arg.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/decl_struct_member.c tests-usr.bin-tests compattestfile,atf
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.83 src/tests/usr.bin/xlint/lint1/Makefile:1.84
--- src/tests/usr.bin/xlint/lint1/Makefile:1.83 Sat Jul 10 09:24:26 2021
+++ src/tests/usr.bin/xlint/lint1/Makefile Sat Jul 10 18:25:57 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2021/07/10 09:24:26 rillig Exp $
+# $NetBSD: Makefile,v 1.84 2021/07/10 18:25:57 rillig Exp $
NOMAN= # defined
MAX_MESSAGE= 345 # see lint1/err.c
@@ -108,6 +108,8 @@ FILES+= d_type_question_colon.c
FILES+= d_typefun.c
FILES+= d_typename_as_var.c
FILES+= d_zero_sized_arrays.c
+FILES+= decl.c
+FILES+= decl.exp
FILES+= decl_arg.c
FILES+= decl_arg.exp
FILES+= decl_struct_member.c
Added files:
Index: src/tests/usr.bin/xlint/lint1/decl.c
diff -u /dev/null src/tests/usr.bin/xlint/lint1/decl.c:1.1
--- /dev/null Sat Jul 10 18:25:57 2021
+++ src/tests/usr.bin/xlint/lint1/decl.c Sat Jul 10 18:25:57 2021
@@ -0,0 +1,73 @@
+/* $NetBSD: decl.c,v 1.1 2021/07/10 18:25:57 rillig Exp $ */
+# 3 "decl.c"
+
+/*
+ * Tests for declarations, especially the distinction between the
+ * declaration-specifiers and the declarators.
+ */
+
+/*
+ * Even though 'const' comes after 'char' and is therefore quite close to the
+ * first identifier, it applies to both identifiers.
+ */
+void
+specifier_qualifier(void)
+{
+ char const a = 1, b = 2;
+
+ /* expect+1: warning: left operand of '=' must be modifiable lvalue [115] */
+ a = 1;
+ /* expect+1: warning: left operand of '=' must be modifiable lvalue [115] */
+ b = 2;
+}
+
+/*
+ * Since 'const' comes before 'char', there is no ambiguity whether the
+ * 'const' applies to all variables or just to the first.
+ */
+void
+qualifier_specifier(void)
+{
+ const char a = 1, b = 2;
+
+ /* expect+1: warning: left operand of '=' must be modifiable lvalue [115] */
+ a = 3;
+ /* expect+1: warning: left operand of '=' must be modifiable lvalue [115] */
+ b = 5;
+}
+
+void
+declarator_with_prefix_qualifier(void)
+{
+ /* expect+1: syntax error 'const' [249] */
+ char a = 1, const b = 2;
+
+ a = 1;
+ /* expect+1: error: 'b' undefined [99] */
+ b = 2;
+}
+
+void
+declarator_with_postfix_qualifier(void)
+{
+ /* expect+1: syntax error 'const' [249] */
+ char a = 1, b const = 2;
+
+ a = 1;
+ b = 2;
+}
+
+void sink(double *);
+
+void
+declarators(void)
+{
+ char *pc = 0, c = 0, **ppc = 0;
+
+ /* expect+1: warning: converting 'pointer to char' to incompatible 'pointer to double' */
+ sink(pc);
+ /* expect+1: warning: illegal combination of pointer (pointer to double) and integer (char) */
+ sink(c);
+ /* expect+1: converting 'pointer to pointer to char' to incompatible 'pointer to double' */
+ sink(ppc);
+}
Index: src/tests/usr.bin/xlint/lint1/decl.exp
diff -u /dev/null src/tests/usr.bin/xlint/lint1/decl.exp:1.1
--- /dev/null Sat Jul 10 18:25:57 2021
+++ src/tests/usr.bin/xlint/lint1/decl.exp Sat Jul 10 18:25:57 2021
@@ -0,0 +1,10 @@
+decl.c(19): warning: left operand of '=' must be modifiable lvalue [115]
+decl.c(21): warning: left operand of '=' must be modifiable lvalue [115]
+decl.c(34): warning: left
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 18:13:06 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: rename func_arg_list to align with C99
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.297 -r1.298 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.297 src/usr.bin/xlint/lint1/cgram.y:1.298
--- src/usr.bin/xlint/lint1/cgram.y:1.297 Sat Jul 10 17:46:55 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 18:13:06 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.297 2021/07/10 17:46:55 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.298 2021/07/10 18:13:06 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.297 2021/07/10 17:46:55 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.298 2021/07/10 18:13:06 rillig Exp $");
#endif
#include
@@ -329,7 +329,7 @@ anonymize(sym_t *s)
%type gcc_statement_expr_item
%type term
%type generic_selection
-%type func_arg_list
+%type argument_expression_list
%type point_or_arrow
%type type_name
%type abstract_declaration
@@ -1731,7 +1731,7 @@ term:/* see C99 6.5.1 */
| term T_LPAREN T_RPAREN {
$$ = new_function_call_node($1, NULL);
}
- | term T_LPAREN func_arg_list T_RPAREN {
+ | term T_LPAREN argument_expression_list T_RPAREN {
$$ = new_function_call_node($1, $3);
}
| term point_or_arrow T_NAME {
@@ -1824,6 +1824,15 @@ generic_association: /* C11 6.5.1.1 */
}
;
+argument_expression_list: /* C99 6.5.2 */
+ expr %prec T_COMMA {
+ $$ = new_function_argument_node(NULL, $1);
+ }
+ | argument_expression_list T_COMMA expr {
+ $$ = new_function_argument_node($1, $3);
+ }
+ ;
+
/*
* The inner part of a GCC statement-expression of the form ({ ... }).
*
@@ -1880,15 +1889,6 @@ string2:
}
;
-func_arg_list:
- expr %prec T_COMMA {
- $$ = new_function_argument_node(NULL, $1);
- }
- | func_arg_list T_COMMA expr {
- $$ = new_function_argument_node($1, $3);
- }
- ;
-
point_or_arrow:
T_POINT {
symtyp = FMEMBER;
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 17:46:55 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y lex.c
Log Message:
lint: rename y_sb to y_name
That buffer is only used for names of identifiers, so be more specific.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.296 -r1.297 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.53 -r1.54 src/usr.bin/xlint/lint1/lex.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.296 src/usr.bin/xlint/lint1/cgram.y:1.297
--- src/usr.bin/xlint/lint1/cgram.y:1.296 Sat Jul 10 17:35:54 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 17:46:55 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.296 2021/07/10 17:35:54 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.297 2021/07/10 17:46:55 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.296 2021/07/10 17:35:54 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.297 2021/07/10 17:46:55 rillig Exp $");
#endif
#include
@@ -121,13 +121,14 @@ anonymize(sym_t *s)
for ( ; s != NULL; s = s->s_next)
s->s_styp = NULL;
}
+
%}
%expect 136
%union {
val_t *y_val;
- sbuf_t *y_sb;
+ sbuf_t *y_name;
sym_t *y_sym;
op_t y_op;
scl_t y_scl;
@@ -272,8 +273,8 @@ anonymize(sym_t *s)
%right T_UNARY T_INCDEC T_SIZEOF T_REAL T_IMAG
%left T_LPAREN T_LBRACK T_POINT T_ARROW
-%token T_NAME
-%token T_TYPENAME
+%token T_NAME
+%token T_TYPENAME
%token T_CON
%token T_STRING
@@ -288,7 +289,7 @@ anonymize(sym_t *s)
%type enum_tag
%type struct
%type struct_declaration
-%type identifier
+%type identifier
%type member_declaration_list_semi
%type member_declaration_list
%type member_declaration
@@ -335,7 +336,7 @@ anonymize(sym_t *s)
%type expr_opt
%type string
%type string2
-%type asm_or_symbolrename_opt
+%type asm_or_symbolrename_opt
%type range
%type block_item_list
%type block_item
Index: src/usr.bin/xlint/lint1/lex.c
diff -u src/usr.bin/xlint/lint1/lex.c:1.53 src/usr.bin/xlint/lint1/lex.c:1.54
--- src/usr.bin/xlint/lint1/lex.c:1.53 Thu Jul 8 03:10:39 2021
+++ src/usr.bin/xlint/lint1/lex.c Sat Jul 10 17:46:55 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.53 2021/07/08 03:10:39 rillig Exp $ */
+/* $NetBSD: lex.c,v 1.54 2021/07/10 17:46:55 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: lex.c,v 1.53 2021/07/08 03:10:39 rillig Exp $");
+__RCSID("$NetBSD: lex.c,v 1.54 2021/07/10 17:46:55 rillig Exp $");
#endif
#include
@@ -440,7 +440,7 @@ lex_name(const char *yytext, size_t yyle
tok = T_NAME;
}
- yylval.y_sb = sb;
+ yylval.y_name = sb;
return tok;
}
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sat Jul 10 17:35:54 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: decl_struct_member.c msg_247.c msg_249.c
src/usr.bin/xlint/lint1: cgram.y decl.c externs1.h lint1.h
Log Message:
lint: rename clrtyp/deftyp to begin_type/end_type
The abbreviations clr/def did not make it obvious that these two
functions or grammar rules form pairs.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/decl_struct_member.c
cvs rdiff -u -r1.13 -r1.14 src/tests/usr.bin/xlint/lint1/msg_247.c
cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/xlint/lint1/msg_249.c
cvs rdiff -u -r1.295 -r1.296 src/usr.bin/xlint/lint1/cgram.y
cvs rdiff -u -r1.196 -r1.197 src/usr.bin/xlint/lint1/decl.c
cvs rdiff -u -r1.115 -r1.116 src/usr.bin/xlint/lint1/externs1.h
cvs rdiff -u -r1.113 -r1.114 src/usr.bin/xlint/lint1/lint1.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/decl_struct_member.c
diff -u src/tests/usr.bin/xlint/lint1/decl_struct_member.c:1.2 src/tests/usr.bin/xlint/lint1/decl_struct_member.c:1.3
--- src/tests/usr.bin/xlint/lint1/decl_struct_member.c:1.2 Sun Jun 20 11:24:32 2021
+++ src/tests/usr.bin/xlint/lint1/decl_struct_member.c Sat Jul 10 17:35:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl_struct_member.c,v 1.2 2021/06/20 11:24:32 rillig Exp $ */
+/* $NetBSD: decl_struct_member.c,v 1.3 2021/07/10 17:35:54 rillig Exp $ */
# 3 "decl_struct_member.c"
/*
@@ -20,6 +20,6 @@ struct {
/*
* FIXME: adding a semicolon here triggers another assertion:
*
- * assertion "t == NOTSPEC" failed in deftyp at decl.c:774
+ * assertion "t == NOTSPEC" failed in end_type at decl.c:774
*/
/* expect+1: cannot recover from previous errors */
Index: src/tests/usr.bin/xlint/lint1/msg_247.c
diff -u src/tests/usr.bin/xlint/lint1/msg_247.c:1.13 src/tests/usr.bin/xlint/lint1/msg_247.c:1.14
--- src/tests/usr.bin/xlint/lint1/msg_247.c:1.13 Fri Apr 9 20:00:07 2021
+++ src/tests/usr.bin/xlint/lint1/msg_247.c Sat Jul 10 17:35:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_247.c,v 1.13 2021/04/09 20:00:07 rillig Exp $ */
+/* $NetBSD: msg_247.c,v 1.14 2021/07/10 17:35:54 rillig Exp $ */
# 3 "msg_247.c"
// Test for message: pointer cast from '%s' to '%s' may be troublesome [247]
@@ -23,7 +23,7 @@ example(struct Other *arg)
* XXX: The target type is reported as 'struct '. In cases
* like these, it would be helpful to print at least the type name
* of the pointer. This type name though is discarded immediately
- * when the parser reduces 'T_TYPENAME clrtyp' to 'clrtyp_typespec'.
+ * in the grammar rule 'typespec: T_TYPENAME'.
* After that, the target type of the cast is just an unnamed struct,
* with no hint at all that there is a typedef for a pointer to the
* struct.
Index: src/tests/usr.bin/xlint/lint1/msg_249.c
diff -u src/tests/usr.bin/xlint/lint1/msg_249.c:1.7 src/tests/usr.bin/xlint/lint1/msg_249.c:1.8
--- src/tests/usr.bin/xlint/lint1/msg_249.c:1.7 Sat Jul 10 11:22:19 2021
+++ src/tests/usr.bin/xlint/lint1/msg_249.c Sat Jul 10 17:35:54 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_249.c,v 1.7 2021/07/10 11:22:19 rillig Exp $ */
+/* $NetBSD: msg_249.c,v 1.8 2021/07/10 17:35:54 rillig Exp $ */
# 3 "msg_249.c"
// Test for message: syntax error '%s' [249]
@@ -53,7 +53,7 @@ struct cover_member_declaration {
/* cover 'noclass_declspecs ...' */
const int noclass_declspecs;
- /* cover 'noclass_declmods deftyp ...' */
+ /* cover 'add_type_qualifier_list end_type' */
/* expect+1: error: syntax error 'member without type' [249] */
const;
};
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.295 src/usr.bin/xlint/lint1/cgram.y:1.296
--- src/usr.bin/xlint/lint1/cgram.y:1.295 Sat Jul 10 17:17:05 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 17:35:54 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.295 2021/07/10 17:17:05 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.296 2021/07/10 17:35:54 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.295 2021/07/10 17:17:05 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.296 2021/07/10 17:35:54 rillig Exp $");
#endif
#include
@@ -393,7 +393,7 @@ top_level_declaration: /* C99 6.9 calls
warning(0);
}
}
- | clrtyp deftyp notype_init_decls T_SEMI {
+ | begin_type end_type notype_init_decls T_SEMI {
if (sflag) {
/* old style declaration; add 'int' */
error(1);
@@ -441,13 +441,13 @@ function_definition: /* C99 6.9.1 */
;
func_decl:
- clrtyp deftyp notype_decl {
+ begin_type end_type notype_decl {
$$ = $3;
}
- | clrtyp declmods deftyp notype_decl {
+ | begin_type declmods end_type notype_decl {
$$ = $4;
}
- | clrtyp
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: msaitoh
Date: Sat Jul 10 17:33:28 UTC 2021
Modified Files:
src/sys/arch/x86/x86: procfs_machdep.c
Log Message:
Add v_spec_ctrl, avx512_fp16, sme, sev and sev_es. Tested by nonaka@.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/x86/x86/procfs_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/procfs_machdep.c
diff -u src/sys/arch/x86/x86/procfs_machdep.c:1.40 src/sys/arch/x86/x86/procfs_machdep.c:1.41
--- src/sys/arch/x86/x86/procfs_machdep.c:1.40 Mon Nov 30 00:04:02 2020
+++ src/sys/arch/x86/x86/procfs_machdep.c Sat Jul 10 17:33:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_machdep.c,v 1.40 2020/11/30 00:04:02 msaitoh Exp $ */
+/* $NetBSD: procfs_machdep.c,v 1.41 2021/07/10 17:33:28 msaitoh Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.40 2020/11/30 00:04:02 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.41 2021/07/10 17:33:28 msaitoh Exp $");
#include
#include
@@ -82,11 +82,13 @@ static const char * const x86_features[]
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
{ /* (3) Linux mapping */
- "cxmmx", NULL, "cyrix_arr", "centaur_mcr", NULL,
- "constant_tsc", NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+ "cxmmx", "k6_mtrr", "cyrix_arr", "centaur_mcr", NULL, NULL, NULL, NULL,
+ "constant_tsc", "up", "art", "arch_perfmon",
+ "pebs", "bts", NULL, NULL,
+ "rep_good", NULL, NULL, "acc_power",
+ "nopl", NULL, "xtopology", "tsc_reliable",
+ "nonstop_tsc", "cpuid", "extd_apicid", "amd_dcm",
+ "aperfmperf", "rapl", "nonstop_tsc_s3", "tsc_known_freq"},
{ /* (4) Intel-defined: 0x0001 ecx */
"pni", "pclmulqdq", "dtes64", "monitor", "ds_cpl", "vmx", "smx", "est",
@@ -112,7 +114,7 @@ static const char * const x86_features[]
{ /* (7) Linux mapping */
NULL, NULL, "cpb", "ebp", NULL, "pln", "pts", "dtherm",
- "hw_pstate", "proc_feedback", "sme", NULL,
+ "hw_pstate", "proc_feedback", NULL, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, "ibrs", "ibpb", "stibp", NULL, NULL, NULL, NULL},
@@ -165,12 +167,12 @@ static const char * const x86_features[]
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
- { /* (15) 0x800a edx */
+ { /* (15) AMD 0x800a edx */
"npt", "lbrv", "svm_lock", "nrip_save",
"tsc_scale", "vmcb_clean", "flushbyasid", "decodeassists",
NULL, NULL, "pausefilter", NULL, "pfthreshold", "avic", NULL,
"v_vmsave_vmload",
- "vgif", NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ "vgif", NULL, NULL, NULL, "v_spec_ctrl", NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
{ /* (16) 0x0007:0 ecx */
@@ -190,9 +192,15 @@ static const char * const x86_features[]
{ /* (18) Intel 0x0007 edx */
NULL, NULL, "avx512_4vnniw", "avx512_4fmaps", "fsrm", NULL, NULL, NULL,
"vp2intersect", NULL, "md_clear", NULL, NULL, NULL, "serialize", NULL,
- "tsxldtrk", NULL, "pconfig", NULL, NULL, NULL, NULL, NULL,
+ "tsxldtrk", NULL, "pconfig", NULL, NULL, NULL, NULL, "avx512_fp16",
NULL, NULL, NULL, NULL,
"flush_l1d", "arch_capabilities", NULL, "ssbd"},
+
+ { /* (19) AMD 0x801f eax */
+ "sme", "sev", NULL, "sev_es", NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
};
static int procfs_getonecpu(int, struct cpu_info *, char *, size_t *);
@@ -354,6 +362,14 @@ procfs_getonecpufeatures(struct cpu_info
diff = last - *left;
}
+ if ((cpu_vendor == CPUVENDOR_AMD)
+ && (ci->ci_max_ext_cpuid >= 0x8019)) {
+ x86_cpuid(0x801f, descs);
+ procfs_getonefeatreg(descs[0], x86_features[19], p + diff,
+ left);
+ diff = last - *left;
+ }
+
return 0; /* XXX */
}
CVS commit: src/usr.sbin/cpuctl/arch
Module Name:src
Committed By: msaitoh
Date: Sat Jul 10 17:18:05 UTC 2021
Modified Files:
src/usr.sbin/cpuctl/arch: i386.c
Log Message:
0x6a and 0x6c are 3rd gen Xeon Scalable (Ice Lake).
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/usr.sbin/cpuctl/arch/i386.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/arch/i386.c
diff -u src/usr.sbin/cpuctl/arch/i386.c:1.115 src/usr.sbin/cpuctl/arch/i386.c:1.116
--- src/usr.sbin/cpuctl/arch/i386.c:1.115 Tue Nov 24 00:48:39 2020
+++ src/usr.sbin/cpuctl/arch/i386.c Sat Jul 10 17:18:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i386.c,v 1.115 2020/11/24 00:48:39 msaitoh Exp $ */
+/* $NetBSD: i386.c,v 1.116 2021/07/10 17:18:05 msaitoh Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.115 2020/11/24 00:48:39 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.116 2021/07/10 17:18:05 msaitoh Exp $");
#endif /* not lint */
#include
@@ -344,8 +344,8 @@ const struct cpu_cpuid_nameclass i386_cp
[0x5e] = "6th gen Core, Xeon E3-1[25]00 v5 (Skylake)",
[0x5f] = "Atom (Goldmont, Denverton)",
[0x66] = "8th gen Core i3 (Cannon Lake)",
-[0x6a] = "Future Xeon (Ice Lake)",
-[0x6c] = "Future Xeon (Ice Lake)",
+[0x6a] = "3rd gen Xeon Scalable (Ice Lake)",
+[0x6c] = "3rd gen Xeon Scalable (Ice Lake)",
[0x7a] = "Atom (Goldmont Plus)",
[0x7d] = "10th gen Core (Ice Lake)",
[0x7e] = "10th gen Core (Ice Lake)",
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 17:17:06 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: extract clrtyp from noclass_declspecs
Finally each clrtyp pairs up with its corresponding deftyp, which makes
the grammar much easier to understand. The many grammar rules that
contain these actions now all look the same.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.294 -r1.295 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.294 src/usr.bin/xlint/lint1/cgram.y:1.295
--- src/usr.bin/xlint/lint1/cgram.y:1.294 Sat Jul 10 17:06:56 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 17:17:05 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.294 2021/07/10 17:06:56 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.295 2021/07/10 17:17:05 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.294 2021/07/10 17:06:56 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.295 2021/07/10 17:17:05 rillig Exp $");
#endif
#include
@@ -672,18 +672,18 @@ member_declaration:
symtyp = FVFT;
$$ = $5;
}
- | noclass_declspecs deftyp {
+ | clrtyp noclass_declspecs deftyp {
symtyp = FMEMBER;
} type_member_decls type_attribute_opt {
symtyp = FVFT;
- $$ = $4;
+ $$ = $5;
}
| clrtyp add_type_qualifier_list deftyp type_attribute_opt {
/* syntax error '%s' */
error(249, "member without type");
$$ = NULL;
}
- | noclass_declspecs deftyp type_attribute_opt {
+ | clrtyp noclass_declspecs deftyp type_attribute_opt {
symtyp = FVFT;
if (!Sflag)
/* anonymous struct/union members is a C9X feature */
@@ -709,13 +709,12 @@ noclass_declspecs:
| type_attribute noclass_declspecs_postfix
;
-/* TODO: pair up clrtyp with deftyp */
noclass_declspecs_postfix:
- clrtyp typespec {
- add_type($2);
+ typespec {
+ add_type($1);
}
- | clrtyp add_type_qualifier_list typespec {
- add_type($3);
+ | add_type_qualifier_list typespec {
+ add_type($2);
}
| noclass_declspecs_postfix T_QUAL {
add_qualifier($2);
@@ -1272,14 +1271,14 @@ abstract_declaration:
clrtyp add_type_qualifier_list deftyp {
$$ = declare_1_abstract(abstract_name());
}
- | noclass_declspecs deftyp {
+ | clrtyp noclass_declspecs deftyp {
$$ = declare_1_abstract(abstract_name());
}
| clrtyp add_type_qualifier_list deftyp abstract_declarator {
$$ = declare_1_abstract($4);
}
- | noclass_declspecs deftyp abstract_declarator {
- $$ = declare_1_abstract($3);
+ | clrtyp noclass_declspecs deftyp abstract_declarator {
+ $$ = declare_1_abstract($4);
}
;
CVS commit: src/sys/arch/x86/include
Module Name:src
Committed By: msaitoh
Date: Sat Jul 10 17:08:37 UTC 2021
Modified Files:
src/sys/arch/x86/include: specialreg.h
Log Message:
Add some definitions from Intel SDM:
- CPUID leaf 7:0 %ecx bit 13 TME_EN (Total Memory Encryption)
- CPUID leaf 7:0 %edx bit 18 PCONFIG (Platform CONFIGuration)
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/arch/x86/include/specialreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/specialreg.h
diff -u src/sys/arch/x86/include/specialreg.h:1.176 src/sys/arch/x86/include/specialreg.h:1.177
--- src/sys/arch/x86/include/specialreg.h:1.176 Tue Nov 24 00:46:28 2020
+++ src/sys/arch/x86/include/specialreg.h Sat Jul 10 17:08:37 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: specialreg.h,v 1.176 2020/11/24 00:46:28 msaitoh Exp $ */
+/* $NetBSD: specialreg.h,v 1.177 2021/07/10 17:08:37 msaitoh Exp $ */
/*
* Copyright (c) 2014-2020 The NetBSD Foundation, Inc.
@@ -458,6 +458,7 @@
#define CPUID_SEF_VPCLMULQDQ __BIT(10)
#define CPUID_SEF_AVX512_VNNI __BIT(11) /* Vector neural Network Instruction */
#define CPUID_SEF_AVX512_BITALG __BIT(12)
+#define CPUID_SEF_TME_EN __BIT(13) /* Total Memory Encryption */
#define CPUID_SEF_AVX512_VPOPCNTDQ __BIT(14)
#define CPUID_SEF_LA57 __BIT(16) /* 57bit linear addr & 5LVL paging */
#define CPUID_SEF_MAWAU __BITS(21, 17) /* MAWAU for BND{LD,ST}X */
@@ -473,7 +474,7 @@
"b\0PREFETCHWT1\0" "b\1AVX512_VBMI\0" "b\2UMIP\0" "b\3PKU\0" \
"b\4OSPKE\0" "b\5WAITPKG\0" "b\6AVX512_VBMI2\0" "b\7CET_SS\0" \
"b\10GFNI\0" "b\11VAES\0" "b\12VPCLMULQDQ\0" "b\13AVX512_VNNI\0"\
- "b\14AVX512_BITALG\0" "b\16AVX512_VPOPCNTDQ\0" \
+ "b\14AVX512_BITALG\0" "b\15TME_EN\0" "b\16AVX512_VPOPCNTDQ\0" \
"b\20LA57\0" \
"f\21\5MAWAU\0" "b\26RDPID\0" "b\27KL\0" \
"b\31CLDEMOTE\0" "b\33MOVDIRI\0" \
@@ -490,6 +491,7 @@
#define CPUID_SEF_SERIALIZE __BIT(14) /* SERIALIZE instruction */
#define CPUID_SEF_HYBRID __BIT(15) /* Hybrid part */
#define CPUID_SEF_TSXLDTRK __BIT(16) /* TSX suspend load addr tracking */
+#define CPUID_SEF_PCONFIG __BIT(18) /* Platform CONFIGuration */
#define CPUID_SEF_CET_IBT __BIT(20) /* CET Indirect Branch Tracking */
#define CPUID_SEF_IBRS __BIT(26) /* IBRS / IBPB Speculation Control */
#define CPUID_SEF_STIBP __BIT(27) /* STIBP Speculation Control */
@@ -503,7 +505,7 @@
"\5" "FSREP_MOV" \
"\11VP2INTERSECT" "\12SRBDS_CTRL" "\13MD_CLEAR" \
"\16TSX_FORCE_ABORT" "\17SERIALIZE" "\20HYBRID" \
- "\21" "TSXLDTRK" \
+ "\21" "TSXLDTRK" "\23" "PCONFIG" \
"\25" "CET_IBT" \
"\33" "IBRS" "\34" "STIBP" \
"\35" "L1D_FLUSH" "\36" "ARCH_CAP" "\37CORE_CAP" "\40" "SSBD"
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 17:06:56 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: extract clrtyp from declaration_specifiers
This makes the grammar more uniform and thereby easier to understand.
The actions clrtyp and deftyp now come in pairs almost everywhere.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.293 -r1.294 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.293 src/usr.bin/xlint/lint1/cgram.y:1.294
--- src/usr.bin/xlint/lint1/cgram.y:1.293 Sat Jul 10 16:54:40 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 17:06:56 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.293 2021/07/10 16:54:40 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.294 2021/07/10 17:06:56 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.293 2021/07/10 16:54:40 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.294 2021/07/10 17:06:56 rillig Exp $");
#endif
#include
@@ -447,8 +447,8 @@ func_decl:
| clrtyp declmods deftyp notype_decl {
$$ = $4;
}
- | declaration_specifiers deftyp type_decl {
- $$ = $3;
+ | clrtyp declaration_specifiers deftyp type_decl {
+ $$ = $4;
}
;
@@ -474,7 +474,7 @@ arg_declaration:
warning(2);
}
| clrtyp declmods deftyp notype_init_decls T_SEMI
- | declaration_specifiers deftyp T_SEMI {
+ | clrtyp declaration_specifiers deftyp T_SEMI {
if (!dcs->d_nonempty_decl) {
/* empty declaration */
warning(2);
@@ -483,14 +483,14 @@ arg_declaration:
warning(3, type_name(dcs->d_type));
}
}
- | declaration_specifiers deftyp type_init_decls T_SEMI {
+ | clrtyp declaration_specifiers deftyp type_init_decls T_SEMI {
if (dcs->d_nonempty_decl) {
/* '%s' declared in argument declaration list */
warning(3, type_name(dcs->d_type));
}
}
| clrtyp declmods error
- | declaration_specifiers error
+ | clrtyp declaration_specifiers error
;
declaration: /* C99 6.7 */
@@ -509,7 +509,7 @@ declaration_noerror: /* see C99 6.7 'de
}
}
| clrtyp declmods deftyp notype_init_decls T_SEMI
- | declaration_specifiers deftyp T_SEMI {
+ | clrtyp declaration_specifiers deftyp T_SEMI {
if (dcs->d_scl == TYPEDEF) {
/* typedef declares no type name */
warning(72);
@@ -518,7 +518,7 @@ declaration_noerror: /* see C99 6.7 'de
warning(2);
}
}
- | declaration_specifiers deftyp type_init_decls T_SEMI
+ | clrtyp declaration_specifiers deftyp type_init_decls T_SEMI
;
clrtyp:
@@ -534,11 +534,11 @@ deftyp:
;
declaration_specifiers: /* C99 6.7 */
- clrtyp typespec {
- add_type($2);
+ typespec {
+ add_type($1);
}
- | clrtyp declmods typespec {
- add_type($3);
+ | declmods typespec {
+ add_type($2);
}
| type_attribute declaration_specifiers
| declaration_specifiers declmod
@@ -709,6 +709,7 @@ noclass_declspecs:
| type_attribute noclass_declspecs_postfix
;
+/* TODO: pair up clrtyp with deftyp */
noclass_declspecs_postfix:
clrtyp typespec {
add_type($2);
@@ -1153,20 +1154,20 @@ parameter_declaration:
clrtyp declmods deftyp {
$$ = declare_argument(abstract_name(), false);
}
- | declaration_specifiers deftyp {
+ | clrtyp declaration_specifiers deftyp {
$$ = declare_argument(abstract_name(), false);
}
| clrtyp declmods deftyp notype_param_decl {
$$ = declare_argument($4, false);
}
- | declaration_specifiers deftyp type_param_decl {
- $$ = declare_argument($3, false);
+ | clrtyp declaration_specifiers deftyp type_param_decl {
+ $$ = declare_argument($4, false);
}
| clrtyp declmods deftyp abstract_declarator {
$$ = declare_argument($4, false);
}
- | declaration_specifiers deftyp abstract_declarator {
- $$ = declare_argument($3, false);
+ | clrtyp declaration_specifiers deftyp abstract_declarator {
+ $$ = declare_argument($4, false);
}
;
@@ -1539,11 +1540,13 @@ for_start: /* see C99 6.8.5 */
;
for_exprs: /* see C99 6.8.5 */
- for_start declaration_specifiers deftyp notype_init_decls T_SEMI
- expr_opt T_SEMI expr_opt T_RPAREN {
+ for_start
+ clrtyp declaration_specifiers deftyp notype_init_decls T_SEMI
+ expr_opt T_SEMI
+ expr_opt T_RPAREN {
/* variable declaration in for loop */
c99ism(325);
- for1(NULL, $6, $8);
+ for1(NULL, $7, $9);
clear_warning_flags();
}
| for_start expr_opt T_SEMI expr_opt T_SEMI expr_opt T_RPAREN {
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 16:54:40 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: split grammar rule clrtyp_declmods
By extracting clrtyp from that rule, clrtyp and deftyp pair up nicely in
most of the grammar rules. These two actions delimit the common part of
a declaration that declares multiple identifiers.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.292 -r1.293 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.292 src/usr.bin/xlint/lint1/cgram.y:1.293
--- src/usr.bin/xlint/lint1/cgram.y:1.292 Sat Jul 10 16:41:51 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 16:54:40 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.292 2021/07/10 16:41:51 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.293 2021/07/10 16:54:40 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.292 2021/07/10 16:41:51 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.293 2021/07/10 16:54:40 rillig Exp $");
#endif
#include
@@ -444,8 +444,8 @@ func_decl:
clrtyp deftyp notype_decl {
$$ = $3;
}
- | clrtyp_declmods deftyp notype_decl {
- $$ = $3;
+ | clrtyp declmods deftyp notype_decl {
+ $$ = $4;
}
| declaration_specifiers deftyp type_decl {
$$ = $3;
@@ -469,11 +469,11 @@ arg_declaration_list: /* C99 6.9.1p13 e
* needs other error handling.
*/
arg_declaration:
- clrtyp_declmods deftyp T_SEMI {
+ clrtyp declmods deftyp T_SEMI {
/* empty declaration */
warning(2);
}
- | clrtyp_declmods deftyp notype_init_decls T_SEMI
+ | clrtyp declmods deftyp notype_init_decls T_SEMI
| declaration_specifiers deftyp T_SEMI {
if (!dcs->d_nonempty_decl) {
/* empty declaration */
@@ -489,7 +489,7 @@ arg_declaration:
warning(3, type_name(dcs->d_type));
}
}
- | clrtyp_declmods error
+ | clrtyp declmods error
| declaration_specifiers error
;
@@ -499,7 +499,7 @@ declaration: /* C99 6.7 */
;
declaration_noerror: /* see C99 6.7 'declaration' */
- clrtyp_declmods deftyp T_SEMI {
+ clrtyp declmods deftyp T_SEMI {
if (dcs->d_scl == TYPEDEF) {
/* typedef declares no type name */
warning(72);
@@ -508,7 +508,7 @@ declaration_noerror: /* see C99 6.7 'de
warning(2);
}
}
- | clrtyp_declmods deftyp notype_init_decls T_SEMI
+ | clrtyp declmods deftyp notype_init_decls T_SEMI
| declaration_specifiers deftyp T_SEMI {
if (dcs->d_scl == TYPEDEF) {
/* typedef declares no type name */
@@ -537,8 +537,8 @@ declaration_specifiers: /* C99 6.7 */
clrtyp typespec {
add_type($2);
}
- | clrtyp_declmods typespec {
- add_type($2);
+ | clrtyp declmods typespec {
+ add_type($3);
}
| type_attribute declaration_specifiers
| declaration_specifiers declmod
@@ -547,9 +547,9 @@ declaration_specifiers: /* C99 6.7 */
}
;
-clrtyp_declmods:
- clrtyp qualifier_or_storage_class
- | clrtyp_declmods declmod
+declmods:
+ qualifier_or_storage_class
+ | declmods declmod
;
declmod:
@@ -1150,20 +1150,20 @@ parameter_type_list:
/* XXX: C99 6.7.5 defines the same name, but it looks completely different. */
parameter_declaration:
- clrtyp_declmods deftyp {
+ clrtyp declmods deftyp {
$$ = declare_argument(abstract_name(), false);
}
| declaration_specifiers deftyp {
$$ = declare_argument(abstract_name(), false);
}
- | clrtyp_declmods deftyp notype_param_decl {
- $$ = declare_argument($3, false);
+ | clrtyp declmods deftyp notype_param_decl {
+ $$ = declare_argument($4, false);
}
| declaration_specifiers deftyp type_param_decl {
$$ = declare_argument($3, false);
}
- | clrtyp_declmods deftyp abstract_declarator {
- $$ = declare_argument($3, false);
+ | clrtyp declmods deftyp abstract_declarator {
+ $$ = declare_argument($4, false);
}
| declaration_specifiers deftyp abstract_declarator {
$$ = declare_argument($3, false);
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 16:41:51 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: inline grammar rule clrtyp_typespec
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.291 -r1.292 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.291 src/usr.bin/xlint/lint1/cgram.y:1.292
--- src/usr.bin/xlint/lint1/cgram.y:1.291 Sat Jul 10 16:39:43 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 16:41:51 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.291 2021/07/10 16:39:43 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.292 2021/07/10 16:41:51 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.291 2021/07/10 16:39:43 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.292 2021/07/10 16:41:51 rillig Exp $");
#endif
#include
@@ -281,7 +281,6 @@ anonymize(sym_t *s)
%type notype_decl
%type type_decl
%type typespec
-%type clrtyp_typespec
%type notype_typespec
%type struct_spec
%type enum_spec
@@ -535,8 +534,8 @@ deftyp:
;
declaration_specifiers: /* C99 6.7 */
- clrtyp_typespec {
- add_type($1);
+ clrtyp typespec {
+ add_type($2);
}
| clrtyp_declmods typespec {
add_type($2);
@@ -567,12 +566,6 @@ qualifier_or_storage_class:
}
;
-clrtyp_typespec:
- clrtyp typespec {
- $$ = $2;
- }
- ;
-
typespec:
notype_typespec
| T_TYPENAME {
@@ -717,8 +710,8 @@ noclass_declspecs:
;
noclass_declspecs_postfix:
- clrtyp_typespec {
- add_type($1);
+ clrtyp typespec {
+ add_type($2);
}
| clrtyp add_type_qualifier_list typespec {
add_type($3);
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 16:39:43 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: merge duplicate code from grammar rule clrtyp_typespec
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.290 -r1.291 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.290 src/usr.bin/xlint/lint1/cgram.y:1.291
--- src/usr.bin/xlint/lint1/cgram.y:1.290 Sat Jul 10 15:04:07 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 16:39:43 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.290 2021/07/10 15:04:07 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.291 2021/07/10 16:39:43 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.290 2021/07/10 15:04:07 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.291 2021/07/10 16:39:43 rillig Exp $");
#endif
#include
@@ -568,12 +568,9 @@ qualifier_or_storage_class:
;
clrtyp_typespec:
- clrtyp notype_typespec {
+ clrtyp typespec {
$$ = $2;
}
- | clrtyp T_TYPENAME {
- $$ = getsym($2)->s_type;
- }
;
typespec:
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 15:04:07 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: swap order in grammar rule clrtyp_typespec
It should not make a difference whether the rule says 'T_TYPENAME
clrtyp' or 'clrtyp T_TYPENAME'. The latter order is more consistent
with the name of the rule, though.
According to the code, these two tokens take completely distinct
actions. The code coverage outside of cgram.y and cgram.c stays exactly
the same, at least for lint's test suite.
No functional change intended.
To generate a diff of this commit:
cvs rdiff -u -r1.289 -r1.290 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.289 src/usr.bin/xlint/lint1/cgram.y:1.290
--- src/usr.bin/xlint/lint1/cgram.y:1.289 Sat Jul 10 14:45:15 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 15:04:07 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.289 2021/07/10 14:45:15 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.290 2021/07/10 15:04:07 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.289 2021/07/10 14:45:15 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.290 2021/07/10 15:04:07 rillig Exp $");
#endif
#include
@@ -571,8 +571,8 @@ clrtyp_typespec:
clrtyp notype_typespec {
$$ = $2;
}
- | T_TYPENAME clrtyp {
- $$ = getsym($1)->s_type;
+ | clrtyp T_TYPENAME {
+ $$ = getsym($2)->s_type;
}
;
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 14:45:15 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: rename grammar rule declmods to clrtyp_declmods
It wasn't obvious from the name 'declmods' that this rule starts a new
type declaration.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.288 -r1.289 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.288 src/usr.bin/xlint/lint1/cgram.y:1.289
--- src/usr.bin/xlint/lint1/cgram.y:1.288 Sat Jul 10 11:22:19 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 14:45:15 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.288 2021/07/10 11:22:19 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.289 2021/07/10 14:45:15 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.288 2021/07/10 11:22:19 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.289 2021/07/10 14:45:15 rillig Exp $");
#endif
#include
@@ -445,7 +445,7 @@ func_decl:
clrtyp deftyp notype_decl {
$$ = $3;
}
- | declmods deftyp notype_decl {
+ | clrtyp_declmods deftyp notype_decl {
$$ = $3;
}
| declaration_specifiers deftyp type_decl {
@@ -470,11 +470,11 @@ arg_declaration_list: /* C99 6.9.1p13 e
* needs other error handling.
*/
arg_declaration:
- declmods deftyp T_SEMI {
+ clrtyp_declmods deftyp T_SEMI {
/* empty declaration */
warning(2);
}
- | declmods deftyp notype_init_decls T_SEMI
+ | clrtyp_declmods deftyp notype_init_decls T_SEMI
| declaration_specifiers deftyp T_SEMI {
if (!dcs->d_nonempty_decl) {
/* empty declaration */
@@ -490,7 +490,7 @@ arg_declaration:
warning(3, type_name(dcs->d_type));
}
}
- | declmods error
+ | clrtyp_declmods error
| declaration_specifiers error
;
@@ -500,7 +500,7 @@ declaration: /* C99 6.7 */
;
declaration_noerror: /* see C99 6.7 'declaration' */
- declmods deftyp T_SEMI {
+ clrtyp_declmods deftyp T_SEMI {
if (dcs->d_scl == TYPEDEF) {
/* typedef declares no type name */
warning(72);
@@ -509,7 +509,7 @@ declaration_noerror: /* see C99 6.7 'de
warning(2);
}
}
- | declmods deftyp notype_init_decls T_SEMI
+ | clrtyp_declmods deftyp notype_init_decls T_SEMI
| declaration_specifiers deftyp T_SEMI {
if (dcs->d_scl == TYPEDEF) {
/* typedef declares no type name */
@@ -538,7 +538,7 @@ declaration_specifiers: /* C99 6.7 */
clrtyp_typespec {
add_type($1);
}
- | declmods typespec {
+ | clrtyp_declmods typespec {
add_type($2);
}
| type_attribute declaration_specifiers
@@ -548,9 +548,9 @@ declaration_specifiers: /* C99 6.7 */
}
;
-declmods:
+clrtyp_declmods:
clrtyp qualifier_or_storage_class
- | declmods declmod
+ | clrtyp_declmods declmod
;
declmod:
@@ -1160,19 +1160,19 @@ parameter_type_list:
/* XXX: C99 6.7.5 defines the same name, but it looks completely different. */
parameter_declaration:
- declmods deftyp {
+ clrtyp_declmods deftyp {
$$ = declare_argument(abstract_name(), false);
}
| declaration_specifiers deftyp {
$$ = declare_argument(abstract_name(), false);
}
- | declmods deftyp notype_param_decl {
+ | clrtyp_declmods deftyp notype_param_decl {
$$ = declare_argument($3, false);
}
| declaration_specifiers deftyp type_param_decl {
$$ = declare_argument($3, false);
}
- | declmods deftyp abstract_declarator {
+ | clrtyp_declmods deftyp abstract_declarator {
$$ = declare_argument($3, false);
}
| declaration_specifiers deftyp abstract_declarator {
CVS commit: src/tests/lib/libc/stdio
Module Name:src Committed By: martin Date: Sat Jul 10 13:22:01 UTC 2021 Modified Files: src/tests/lib/libc/stdio: t_fmemopen.c Log Message: Use intmax_t to printf an off_t To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/lib/libc/stdio/t_fmemopen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/stdio/t_fmemopen.c diff -u src/tests/lib/libc/stdio/t_fmemopen.c:1.5 src/tests/lib/libc/stdio/t_fmemopen.c:1.6 --- src/tests/lib/libc/stdio/t_fmemopen.c:1.5 Sat Jul 10 07:50:33 2021 +++ src/tests/lib/libc/stdio/t_fmemopen.c Sat Jul 10 13:22:01 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: t_fmemopen.c,v 1.5 2021/07/10 07:50:33 christos Exp $ */ +/* $NetBSD: t_fmemopen.c,v 1.6 2021/07/10 13:22:01 martin Exp $ */ /*- * Copyright (c)2010 Takehiko NOZAKI, @@ -965,7 +965,8 @@ ATF_TC_BODY(test19, tc) /* don't accept non nul character at end of buffer */ ATF_CHECK(fputc(0x1, fp) == EOF); ATF_CHECK_MSG(ftello(fp) == (off_t)t->n, -"%td != %td", ftello(fp), (off_t)t->n); +"%jd != %jd", (intmax_t)ftello(fp), +(intmax_t)t->n); ATF_CHECK(feof(fp) == 0); /* accept nul character at end of buffer */
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 12:17:31 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: err.c
Log Message:
lint: flush stdout before an internal error
Previously, the internal error may have appeared too early in the
output. Provoking internal errors and assertion failures is still easy,
just run afl-fuzz for a few seconds.
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/usr.bin/xlint/lint1/err.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.126 src/usr.bin/xlint/lint1/err.c:1.127
--- src/usr.bin/xlint/lint1/err.c:1.126 Mon Jul 5 19:53:43 2021
+++ src/usr.bin/xlint/lint1/err.c Sat Jul 10 12:17:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.126 2021/07/05 19:53:43 rillig Exp $ */
+/* $NetBSD: err.c,v 1.127 2021/07/10 12:17:31 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: err.c,v 1.126 2021/07/05 19:53:43 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.127 2021/07/10 12:17:31 rillig Exp $");
#endif
#include
@@ -569,6 +569,7 @@ internal_error(const char *file, int lin
const char *fn;
fn = lbasename(curr_pos.p_file);
+ fflush(stdout);
(void)fprintf(stderr, "lint: internal error in %s:%d near %s:%d: ",
file, line, fn, curr_pos.p_line);
va_start(ap, msg);
@@ -585,6 +586,7 @@ assert_failed(const char *file, int line
const char *fn;
fn = lbasename(curr_pos.p_file);
+ fflush(stdout);
(void)fprintf(stderr,
"lint: assertion \"%s\" failed in %s at %s:%d near %s:%d\n",
cond, func, file, line, fn, curr_pos.p_line);
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sat Jul 10 12:10:40 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: d_lint_assert.c d_lint_assert.exp
src/usr.bin/xlint/lint1: decl.c
Log Message:
lint: fix assertion failure in declare_argument
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/d_lint_assert.c \
src/tests/usr.bin/xlint/lint1/d_lint_assert.exp
cvs rdiff -u -r1.195 -r1.196 src/usr.bin/xlint/lint1/decl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/d_lint_assert.c
diff -u src/tests/usr.bin/xlint/lint1/d_lint_assert.c:1.3 src/tests/usr.bin/xlint/lint1/d_lint_assert.c:1.4
--- src/tests/usr.bin/xlint/lint1/d_lint_assert.c:1.3 Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/d_lint_assert.c Sat Jul 10 12:10:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_lint_assert.c,v 1.3 2021/02/21 09:07:58 rillig Exp $ */
+/* $NetBSD: d_lint_assert.c,v 1.4 2021/07/10 12:10:39 rillig Exp $ */
# 3 "d_lint_assert.c"
/*
@@ -13,3 +13,10 @@ enum {
// near d_lint_assert.c:14
A = +++
};/* expect: 249 */
+
+/*
+ * Before decl.c 1.196 from 2021-07-10, lint ran into an assertion failure
+ * for 'sym->s_type != NULL' in declare_argument.
+ */
+/* expect+1: warning: old style declaration; add 'int' [1] */
+c(void());
Index: src/tests/usr.bin/xlint/lint1/d_lint_assert.exp
diff -u src/tests/usr.bin/xlint/lint1/d_lint_assert.exp:1.3 src/tests/usr.bin/xlint/lint1/d_lint_assert.exp:1.4
--- src/tests/usr.bin/xlint/lint1/d_lint_assert.exp:1.3 Sun Mar 21 20:44:59 2021
+++ src/tests/usr.bin/xlint/lint1/d_lint_assert.exp Sat Jul 10 12:10:39 2021
@@ -1 +1,2 @@
d_lint_assert.c(15): error: syntax error '}' [249]
+d_lint_assert.c(22): warning: old style declaration; add 'int' [1]
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.195 src/usr.bin/xlint/lint1/decl.c:1.196
--- src/usr.bin/xlint/lint1/decl.c:1.195 Mon Jul 5 19:55:51 2021
+++ src/usr.bin/xlint/lint1/decl.c Sat Jul 10 12:10:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.195 2021/07/05 19:55:51 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.196 2021/07/10 12:10:39 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.195 2021/07/05 19:55:51 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.196 2021/07/10 12:10:39 rillig Exp $");
#endif
#include
@@ -2430,7 +2430,9 @@ declare_argument(sym_t *sym, bool initfl
error(52, sym->s_name);
}
- lint_assert(sym->s_type != NULL);
+ if (sym->s_type == NULL) /* for c(void()) */
+ sym->s_type = gettyp(VOID);
+
if ((t = sym->s_type->t_tspec) == ARRAY) {
sym->s_type = derive_type(sym->s_type->t_subt, PTR);
} else if (t == FUNC) {
@@ -2448,7 +2450,7 @@ declare_argument(sym_t *sym, bool initfl
warning(269, sym->s_name);
/*
- * Arguments must have complete types. lengths() prints the needed
+ * Arguments must have complete types. length() prints the needed
* error messages (null dimension is impossible because arrays are
* converted to pointers).
*/
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sat Jul 10 11:22:19 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: msg_249.c msg_249.exp
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: do not allow struct{const;}
In traditional C, a struct member was defined syntactically as
'type-specifier struct-declarator-list', the concept of a type-qualifier
was not known back then.
C90 invented the type-qualifier 'const' and relaxed the syntactic
requirement for struct member declarations by allowing 'const x'. Having
only a type-qualifier without an actual type may be regarded as an
"incomplete type", which would be forbidden by C90 and later.
Anyway, this doesn't occur in practice anyway, so there is no need for
lint to try to parse it. This removes a bit of dead code, since a
type-qualifier-list can never have type struct or union.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/msg_249.c
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/msg_249.exp
cvs rdiff -u -r1.287 -r1.288 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/msg_249.c
diff -u src/tests/usr.bin/xlint/lint1/msg_249.c:1.6 src/tests/usr.bin/xlint/lint1/msg_249.c:1.7
--- src/tests/usr.bin/xlint/lint1/msg_249.c:1.6 Sat Jul 10 10:30:26 2021
+++ src/tests/usr.bin/xlint/lint1/msg_249.c Sat Jul 10 11:22:19 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_249.c,v 1.6 2021/07/10 10:30:26 rillig Exp $ */
+/* $NetBSD: msg_249.c,v 1.7 2021/07/10 11:22:19 rillig Exp $ */
# 3 "msg_249.c"
// Test for message: syntax error '%s' [249]
@@ -54,6 +54,6 @@ struct cover_member_declaration {
const int noclass_declspecs;
/* cover 'noclass_declmods deftyp ...' */
- /* expect+1: error: syntax error 'unnamed member' [249] */
+ /* expect+1: error: syntax error 'member without type' [249] */
const;
};
Index: src/tests/usr.bin/xlint/lint1/msg_249.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_249.exp:1.5 src/tests/usr.bin/xlint/lint1/msg_249.exp:1.6
--- src/tests/usr.bin/xlint/lint1/msg_249.exp:1.5 Sat Jul 10 10:30:26 2021
+++ src/tests/usr.bin/xlint/lint1/msg_249.exp Sat Jul 10 11:22:19 2021
@@ -1,4 +1,4 @@
msg_249.c(10): error: syntax error '"' [249]
msg_249.c(19): error: syntax error '"' [249]
msg_249.c(33): error: syntax error ')' [249]
-msg_249.c(58): error: syntax error 'unnamed member' [249]
+msg_249.c(58): error: syntax error 'member without type' [249]
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.287 src/usr.bin/xlint/lint1/cgram.y:1.288
--- src/usr.bin/xlint/lint1/cgram.y:1.287 Sat Jul 10 10:56:30 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 11:22:19 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.287 2021/07/10 10:56:30 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.288 2021/07/10 11:22:19 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.287 2021/07/10 10:56:30 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.288 2021/07/10 11:22:19 rillig Exp $");
#endif
#include
@@ -689,19 +689,9 @@ member_declaration:
$$ = $4;
}
| clrtyp add_type_qualifier_list deftyp type_attribute_opt {
- symtyp = FVFT;
- if (!Sflag)
- /* anonymous struct/union members is a C9X feature */
- warning(49);
- if (is_struct_or_union(dcs->d_type->t_tspec)) {
- $$ = dcs->d_type->t_str->sou_first_member;
- /* add all the members of the anonymous struct/union */
- anonymize($$);
- } else {
- /* syntax error '%s' */
- error(249, "unnamed member");
- $$ = NULL;
- }
+ /* syntax error '%s' */
+ error(249, "member without type");
+ $$ = NULL;
}
| noclass_declspecs deftyp type_attribute_opt {
symtyp = FVFT;
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sat Jul 10 10:56:31 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: d_c99_anon_struct.c
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: remove noclass_declmods from grammar
That rule was hard to understand since it contained clrtyp but not the
corresponding deftyp. It's easier to read when a grammar rule contains
both clrtyp and deftyp in the same line.
C99 does not mention the term 'decl-modifier' anywhere, and in fact the
only thing that this grammar rule allowed was a type-qualifier-list.
The new name better reflect this.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/d_c99_anon_struct.c
cvs rdiff -u -r1.286 -r1.287 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/d_c99_anon_struct.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_anon_struct.c:1.3 src/tests/usr.bin/xlint/lint1/d_c99_anon_struct.c:1.4
--- src/tests/usr.bin/xlint/lint1/d_c99_anon_struct.c:1.3 Sun Jan 31 14:39:31 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_anon_struct.c Sat Jul 10 10:56:31 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_c99_anon_struct.c,v 1.3 2021/01/31 14:39:31 rillig Exp $ */
+/* $NetBSD: d_c99_anon_struct.c,v 1.4 2021/07/10 10:56:31 rillig Exp $ */
# 3 "d_c99_anon_struct.c"
/* Anonymous struct test */
@@ -10,7 +10,7 @@ struct point {
int y;
};
-struct bar {
+struct rect {
struct {
struct point top_left;
struct point bottom_right;
@@ -22,7 +22,7 @@ struct bar {
int
main(void)
{
- struct bar b;
- b.top_left.x = 1;
+ struct rect r;
+ r.top_left.x = 1;
return 0;
}
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.286 src/usr.bin/xlint/lint1/cgram.y:1.287
--- src/usr.bin/xlint/lint1/cgram.y:1.286 Sat Jul 10 10:30:26 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 10:56:30 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.286 2021/07/10 10:30:26 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.287 2021/07/10 10:56:30 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.286 2021/07/10 10:30:26 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.287 2021/07/10 10:56:30 rillig Exp $");
#endif
#include
@@ -675,12 +675,12 @@ member_declaration_list:
;
member_declaration:
- noclass_declmods deftyp {
+ clrtyp add_type_qualifier_list deftyp {
/* too late, i know, but getsym() compensates it */
symtyp = FMEMBER;
} notype_member_decls type_attribute_opt {
symtyp = FVFT;
- $$ = $4;
+ $$ = $5;
}
| noclass_declspecs deftyp {
symtyp = FMEMBER;
@@ -688,7 +688,7 @@ member_declaration:
symtyp = FVFT;
$$ = $4;
}
- | noclass_declmods deftyp type_attribute_opt {
+ | clrtyp add_type_qualifier_list deftyp type_attribute_opt {
symtyp = FVFT;
if (!Sflag)
/* anonymous struct/union members is a C9X feature */
@@ -733,8 +733,8 @@ noclass_declspecs_postfix:
clrtyp_typespec {
add_type($1);
}
- | noclass_declmods typespec {
- add_type($2);
+ | clrtyp add_type_qualifier_list typespec {
+ add_type($3);
}
| noclass_declspecs_postfix T_QUAL {
add_qualifier($2);
@@ -745,12 +745,14 @@ noclass_declspecs_postfix:
| noclass_declspecs_postfix type_attribute
;
-noclass_declmods:
- clrtyp T_QUAL {
- add_qualifier($2);
- }
- | noclass_declmods T_QUAL {
- add_qualifier($2);
+add_type_qualifier_list:
+ add_type_qualifier
+ | add_type_qualifier_list add_type_qualifier
+ ;
+
+add_type_qualifier:
+ T_QUAL {
+ add_qualifier($1);
}
;
@@ -1286,14 +1288,14 @@ type_name: /* C99 6.7.6 */
;
abstract_declaration:
- noclass_declmods deftyp {
+ clrtyp add_type_qualifier_list deftyp {
$$ = declare_1_abstract(abstract_name());
}
| noclass_declspecs deftyp {
$$ = declare_1_abstract(abstract_name());
}
- | noclass_declmods deftyp abstract_declarator {
- $$ = declare_1_abstract($3);
+ | clrtyp add_type_qualifier_list deftyp abstract_declarator {
+ $$ = declare_1_abstract($4);
}
| noclass_declspecs deftyp abstract_declarator {
$$ = declare_1_abstract($3);
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sat Jul 10 10:30:26 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: msg_249.c msg_249.exp
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: fix assertion failure for malformed member declaration
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/msg_249.c
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/msg_249.exp
cvs rdiff -u -r1.285 -r1.286 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/msg_249.c
diff -u src/tests/usr.bin/xlint/lint1/msg_249.c:1.5 src/tests/usr.bin/xlint/lint1/msg_249.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_249.c:1.5 Thu Jul 8 20:11:15 2021
+++ src/tests/usr.bin/xlint/lint1/msg_249.c Sat Jul 10 10:30:26 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_249.c,v 1.5 2021/07/08 20:11:15 rillig Exp $ */
+/* $NetBSD: msg_249.c,v 1.6 2021/07/10 10:30:26 rillig Exp $ */
# 3 "msg_249.c"
// Test for message: syntax error '%s' [249]
@@ -45,3 +45,15 @@ access_declaration_after_syntax_error(vo
{
return _from_rparen;
}
+
+struct cover_member_declaration {
+ /* cover 'noclass_declmods ... notype_member_decls' */
+ const noclass_declmods;
+
+ /* cover 'noclass_declspecs ...' */
+ const int noclass_declspecs;
+
+ /* cover 'noclass_declmods deftyp ...' */
+ /* expect+1: error: syntax error 'unnamed member' [249] */
+ const;
+};
Index: src/tests/usr.bin/xlint/lint1/msg_249.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_249.exp:1.4 src/tests/usr.bin/xlint/lint1/msg_249.exp:1.5
--- src/tests/usr.bin/xlint/lint1/msg_249.exp:1.4 Thu Jul 8 18:02:22 2021
+++ src/tests/usr.bin/xlint/lint1/msg_249.exp Sat Jul 10 10:30:26 2021
@@ -1,3 +1,4 @@
msg_249.c(10): error: syntax error '"' [249]
msg_249.c(19): error: syntax error '"' [249]
msg_249.c(33): error: syntax error ')' [249]
+msg_249.c(58): error: syntax error 'unnamed member' [249]
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.285 src/usr.bin/xlint/lint1/cgram.y:1.286
--- src/usr.bin/xlint/lint1/cgram.y:1.285 Sat Jul 10 09:53:00 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 10:30:26 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.285 2021/07/10 09:53:00 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.286 2021/07/10 10:30:26 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.285 2021/07/10 09:53:00 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.286 2021/07/10 10:30:26 rillig Exp $");
#endif
#include
@@ -690,18 +690,21 @@ member_declaration:
}
| noclass_declmods deftyp type_attribute_opt {
symtyp = FVFT;
- /* struct or union member must be named */
if (!Sflag)
/* anonymous struct/union members is a C9X feature */
warning(49);
- /* add all the members of the anonymous struct/union */
- lint_assert(is_struct_or_union(dcs->d_type->t_tspec));
- $$ = dcs->d_type->t_str->sou_first_member;
- anonymize($$);
+ if (is_struct_or_union(dcs->d_type->t_tspec)) {
+ $$ = dcs->d_type->t_str->sou_first_member;
+ /* add all the members of the anonymous struct/union */
+ anonymize($$);
+ } else {
+ /* syntax error '%s' */
+ error(249, "unnamed member");
+ $$ = NULL;
+ }
}
| noclass_declspecs deftyp type_attribute_opt {
symtyp = FVFT;
- /* struct or union member must be named */
if (!Sflag)
/* anonymous struct/union members is a C9X feature */
warning(49);
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 09:53:00 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: merge duplicate code in grammar for 'for' loops
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.284 -r1.285 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.284 src/usr.bin/xlint/lint1/cgram.y:1.285
--- src/usr.bin/xlint/lint1/cgram.y:1.284 Sat Jul 10 09:48:41 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 09:53:00 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.284 2021/07/10 09:48:41 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.285 2021/07/10 09:53:00 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.284 2021/07/10 09:48:41 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.285 2021/07/10 09:53:00 rillig Exp $");
#endif
#include
@@ -1513,7 +1513,7 @@ iteration_statement: /* C99 6.8.5 */
T_WHILE T_LPAREN expr T_RPAREN {
while1($3);
clear_warning_flags();
- } while_body {
+ } iteration_body {
clear_warning_flags();
while2();
}
@@ -1527,13 +1527,7 @@ iteration_statement: /* C99 6.8.5 */
clear_warning_flags();
do2(NULL);
}
- | for_exprs statement {
- clear_warning_flags();
- for2();
- end_declaration_level();
- block_level--;
- }
- | for_exprs error {
+ | for_exprs iteration_body {
clear_warning_flags();
for2();
end_declaration_level();
@@ -1541,7 +1535,7 @@ iteration_statement: /* C99 6.8.5 */
}
;
-while_body:
+iteration_body:
statement
| error
;
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 09:48:41 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: clean up grammar for do-while statements
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.283 -r1.284 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.283 src/usr.bin/xlint/lint1/cgram.y:1.284
--- src/usr.bin/xlint/lint1/cgram.y:1.283 Sat Jul 10 09:40:12 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 09:48:41 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.283 2021/07/10 09:40:12 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.284 2021/07/10 09:48:41 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.283 2021/07/10 09:40:12 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.284 2021/07/10 09:48:41 rillig Exp $");
#endif
#include
@@ -333,7 +333,6 @@ anonymize(sym_t *s)
%type point_or_arrow
%type type_name
%type abstract_declaration
-%type do_while_expr
%type expr_opt
%type string
%type string2
@@ -1510,12 +1509,6 @@ switch_expr: /* see C99 6.8.4 */
}
;
-do_statement: /* C99 6.8.5 */
- do statement {
- clear_warning_flags();
- }
- ;
-
iteration_statement: /* C99 6.8.5 */
T_WHILE T_LPAREN expr T_RPAREN {
while1($3);
@@ -1524,8 +1517,10 @@ iteration_statement: /* C99 6.8.5 */
clear_warning_flags();
while2();
}
- | do_statement do_while_expr {
- do2($2);
+ | do statement {
+ clear_warning_flags();
+ } T_WHILE T_LPAREN expr T_RPAREN T_SEMI {
+ do2($6);
seen_fallthrough = false;
}
| do error {
@@ -1557,12 +1552,6 @@ do:/* see C99 6.8.5 */
}
;
-do_while_expr: /* see C99 6.8.5 */
- T_WHILE T_LPAREN expr T_RPAREN T_SEMI {
- $$ = $3;
- }
- ;
-
for_start: /* see C99 6.8.5 */
T_FOR T_LPAREN {
begin_declaration_level(AUTO);
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 09:40:12 UTC 2021
Modified Files:
src/usr.bin/xlint/lint1: cgram.y
Log Message:
lint: merge duplicate code in grammar for 'while' statements
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.282 -r1.283 src/usr.bin/xlint/lint1/cgram.y
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/xlint/lint1/cgram.y
diff -u src/usr.bin/xlint/lint1/cgram.y:1.282 src/usr.bin/xlint/lint1/cgram.y:1.283
--- src/usr.bin/xlint/lint1/cgram.y:1.282 Sat Jul 10 05:42:29 2021
+++ src/usr.bin/xlint/lint1/cgram.y Sat Jul 10 09:40:12 2021
@@ -1,5 +1,5 @@
%{
-/* $NetBSD: cgram.y,v 1.282 2021/07/10 05:42:29 rillig Exp $ */
+/* $NetBSD: cgram.y,v 1.283 2021/07/10 09:40:12 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.y,v 1.282 2021/07/10 05:42:29 rillig Exp $");
+__RCSID("$NetBSD: cgram.y,v 1.283 2021/07/10 09:40:12 rillig Exp $");
#endif
#include
@@ -1517,11 +1517,10 @@ do_statement: /* C99 6.8.5 */
;
iteration_statement: /* C99 6.8.5 */
- while_expr statement {
+ T_WHILE T_LPAREN expr T_RPAREN {
+ while1($3);
clear_warning_flags();
- while2();
- }
- | while_expr error {
+ } while_body {
clear_warning_flags();
while2();
}
@@ -1547,11 +1546,9 @@ iteration_statement: /* C99 6.8.5 */
}
;
-while_expr: /* see C99 6.8.5 */
- T_WHILE T_LPAREN expr T_RPAREN {
- while1($3);
- clear_warning_flags();
- }
+while_body:
+ statement
+ | error
;
do:/* see C99 6.8.5 */
CVS commit: src
Module Name:src
Committed By: rillig
Date: Sat Jul 10 09:24:27 UTC 2021
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: Makefile decl_arg.c msg_190.c
msg_190.exp
Added Files:
src/tests/usr.bin/xlint/lint1: init.c init.exp init_c90.c init_c90.exp
Log Message:
tests/lint: add more tests for covering the grammar
To generate a diff of this commit:
cvs rdiff -u -r1.1081 -r1.1082 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.82 -r1.83 src/tests/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/decl_arg.c
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/xlint/lint1/init.c \
src/tests/usr.bin/xlint/lint1/init.exp \
src/tests/usr.bin/xlint/lint1/init_c90.c \
src/tests/usr.bin/xlint/lint1/init_c90.exp
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/msg_190.c \
src/tests/usr.bin/xlint/lint1/msg_190.exp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1081 src/distrib/sets/lists/tests/mi:1.1082
--- src/distrib/sets/lists/tests/mi:1.1081 Fri Jul 9 20:20:03 2021
+++ src/distrib/sets/lists/tests/mi Sat Jul 10 09:24:26 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1081 2021/07/09 20:20:03 rillig Exp $
+# $NetBSD: mi,v 1.1082 2021/07/10 09:24:26 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6244,6 +6244,10 @@
./usr/tests/usr.bin/xlint/lint1/gcc_init_compound_literal.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/gcc_typeof_after_statement.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/gcc_typeof_after_statement.exp tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/init.ctests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/init.exp tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/init_c90.c tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/init_c90.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/lex_char.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/lex_char.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/lex_char_uchar.c tests-usr.bin-tests compattestfile,atf
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.82 src/tests/usr.bin/xlint/lint1/Makefile:1.83
--- src/tests/usr.bin/xlint/lint1/Makefile:1.82 Fri Jul 9 20:20:03 2021
+++ src/tests/usr.bin/xlint/lint1/Makefile Sat Jul 10 09:24:26 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2021/07/09 20:20:03 rillig Exp $
+# $NetBSD: Makefile,v 1.83 2021/07/10 09:24:26 rillig Exp $
NOMAN= # defined
MAX_MESSAGE= 345 # see lint1/err.c
@@ -141,6 +141,10 @@ FILES+= gcc_init_compound_literal.c
FILES+= gcc_init_compound_literal.exp
FILES+= gcc_typeof_after_statement.c
FILES+= gcc_typeof_after_statement.exp
+FILES+= init.c
+FILES+= init.exp
+FILES+= init_c90.c
+FILES+= init_c90.exp
FILES+= lex_char.c
FILES+= lex_char.exp
FILES+= lex_char_uchar.c
Index: src/tests/usr.bin/xlint/lint1/decl_arg.c
diff -u src/tests/usr.bin/xlint/lint1/decl_arg.c:1.4 src/tests/usr.bin/xlint/lint1/decl_arg.c:1.5
--- src/tests/usr.bin/xlint/lint1/decl_arg.c:1.4 Sat Jul 10 08:40:36 2021
+++ src/tests/usr.bin/xlint/lint1/decl_arg.c Sat Jul 10 09:24:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl_arg.c,v 1.4 2021/07/10 08:40:36 rillig Exp $ */
+/* $NetBSD: decl_arg.c,v 1.5 2021/07/10 09:24:27 rillig Exp $ */
# 3 "decl_arg.c"
/*
@@ -123,3 +123,9 @@ void cover_parameter_declaration(
double *const, /* 6 */
...
);
+
+void cover_asm_or_symbolrename_asm(void)
+__asm("assembly code");
+
+void cover_asm_or_symbolrename_symbolrename(void)
+__symbolrename(alternate_name);
Index: src/tests/usr.bin/xlint/lint1/msg_190.c
diff -u src/tests/usr.bin/xlint/lint1/msg_190.c:1.2 src/tests/usr.bin/xlint/lint1/msg_190.c:1.3
--- src/tests/usr.bin/xlint/lint1/msg_190.c:1.2 Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/msg_190.c Sat Jul 10 09:24:27 2021
@@ -1,7 +1,9 @@
-/* $NetBSD: msg_190.c,v 1.2 2021/02/21 09:07:58 rillig Exp $ */
+/* $NetBSD: msg_190.c,v 1.3 2021/07/10 09:24:27 rillig Exp $ */
# 3 "msg_190.c"
// Test for message: empty array declaration: %s [190]
-TODO: "Add example code that triggers the above message." /* expect: 249 */
-TODO: "Add example code that almost triggers the above message."
+/* expect+1: error: empty array declaration: empty_array [190] */
+double empty_array[] = {};
+
+double array[] = { 1 };
Index: src/tests/usr.bin/xlint/lint1/msg_190.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_190.exp:1.2 src/tests/usr.bin/xlint/lint1/msg_190.exp:1.3
--- src/tests/usr.bin/xlint/lint1/msg_190.exp:1.2 Sun Mar 21 20:45:00 2021
+++
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sat Jul 10 09:14:38 UTC 2021 Modified Files: src/usr.bin/xlint/lint1: Makefile Log Message: tests/lint: when adding a new test, set an invalid option This forces the test author to think about whether any custom options are really needed. While here, mention the other possible customizations as well. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/usr.bin/xlint/lint1/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/xlint/lint1/Makefile diff -u src/usr.bin/xlint/lint1/Makefile:1.78 src/usr.bin/xlint/lint1/Makefile:1.79 --- src/usr.bin/xlint/lint1/Makefile:1.78 Mon Jul 5 10:34:26 2021 +++ src/usr.bin/xlint/lint1/Makefile Sat Jul 10 09:14:38 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.78 2021/07/05 10:34:26 hgutch Exp $ +# $NetBSD: Makefile,v 1.79 2021/07/10 09:14:38 rillig Exp $ .include @@ -74,7 +74,10 @@ add-test: .PHONY ' * TODO: Explain the purpose of the test.' \ ' */' \ '' \ - '/* lint1-extra-flags: -p */' \ + '/* lint1-extra-flags: -Z */' \ + '/* lint1-flags: -Z */' \ + '/* lint1-only-if: schar uchar ilp32 lp64 int long */' \ + '/* lint1-skip-if: ldbl-64 ldbl-96 ldbl-128 */' \ '' \ '// TODO: Add some code that passes.' \ '// TODO: Add some code that fails.' \
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sat Jul 10 08:40:36 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: decl_arg.c decl_arg.exp Log Message: tests/lint: add code coverage for grammar rule parameter_declaration To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/decl_arg.c cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/decl_arg.exp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/xlint/lint1/decl_arg.c diff -u src/tests/usr.bin/xlint/lint1/decl_arg.c:1.3 src/tests/usr.bin/xlint/lint1/decl_arg.c:1.4 --- src/tests/usr.bin/xlint/lint1/decl_arg.c:1.3 Sat Jul 10 08:01:11 2021 +++ src/tests/usr.bin/xlint/lint1/decl_arg.c Sat Jul 10 08:40:36 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: decl_arg.c,v 1.3 2021/07/10 08:01:11 rillig Exp $ */ +/* $NetBSD: decl_arg.c,v 1.4 2021/07/10 08:40:36 rillig Exp $ */ # 3 "decl_arg.c" /* @@ -102,9 +102,24 @@ void test_varargs_attribute( * need to be enclosed by one more pair of parentheses than usual. */ void cover_direct_notype_param_decl( -double (f1), +double (identifier), double ((parenthesized)), double (array[]), double (array_size[3]), double (*)(void (function())) ); + +/* + * Just some unrealistic code to cover the grammar rule parameter_declaration. + */ +/* expect+4: error: only register valid as formal parameter storage class [9] */ +void cover_parameter_declaration( +volatile, /* 1 */ +double, /* 2 */ +static storage_class, /* 3.1 */ +const type_qualifier, /* 3.2 */ +double (identifier), /* 4 */ +const (*), /* 5 */ +double *const, /* 6 */ +... +); Index: src/tests/usr.bin/xlint/lint1/decl_arg.exp diff -u src/tests/usr.bin/xlint/lint1/decl_arg.exp:1.1 src/tests/usr.bin/xlint/lint1/decl_arg.exp:1.2 --- src/tests/usr.bin/xlint/lint1/decl_arg.exp:1.1 Fri Jul 9 20:20:03 2021 +++ src/tests/usr.bin/xlint/lint1/decl_arg.exp Sat Jul 10 08:40:36 2021 @@ -25,3 +25,4 @@ decl_arg.c(77): error: declared argument decl_arg.c(79): error: declared argument postfix_attribute is missing [53] decl_arg.c(81): error: declared argument infix_attribute is missing [53] decl_arg.c(90): error: declared argument pointer_prefix_attribute is missing [53] +decl_arg.c(119): error: only register valid as formal parameter storage class [9]
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Sat Jul 10 08:01:11 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: decl_arg.c Log Message: lint: add code coverage for grammar rule direct_notype_param_decl To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/decl_arg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/xlint/lint1/decl_arg.c diff -u src/tests/usr.bin/xlint/lint1/decl_arg.c:1.2 src/tests/usr.bin/xlint/lint1/decl_arg.c:1.3 --- src/tests/usr.bin/xlint/lint1/decl_arg.c:1.2 Sat Jul 10 06:01:41 2021 +++ src/tests/usr.bin/xlint/lint1/decl_arg.c Sat Jul 10 08:01:11 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: decl_arg.c,v 1.2 2021/07/10 06:01:41 rillig Exp $ */ +/* $NetBSD: decl_arg.c,v 1.3 2021/07/10 08:01:11 rillig Exp $ */ # 3 "decl_arg.c" /* @@ -96,3 +96,15 @@ void test_varargs_attribute( void (*pr)(const char *, ...) __attribute__((__format__(__printf__, 1, 2))) ); + +/* + * XXX: To cover the grammar rule 'direct_notype_param_decl', the parameters + * need to be enclosed by one more pair of parentheses than usual. + */ +void cover_direct_notype_param_decl( +double (f1), +double ((parenthesized)), +double (array[]), +double (array_size[3]), +double (*)(void (function())) +);
CVS commit: src/tests/lib/libc/stdio
Module Name:src Committed By: christos Date: Sat Jul 10 07:50:33 UTC 2021 Modified Files: src/tests/lib/libc/stdio: t_fmemopen.c Log Message: add more info to ease future debugging. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/stdio/t_fmemopen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/lib/libc/stdio/t_fmemopen.c diff -u src/tests/lib/libc/stdio/t_fmemopen.c:1.4 src/tests/lib/libc/stdio/t_fmemopen.c:1.5 --- src/tests/lib/libc/stdio/t_fmemopen.c:1.4 Sat Oct 19 13:45:00 2013 +++ src/tests/lib/libc/stdio/t_fmemopen.c Sat Jul 10 03:50:33 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: t_fmemopen.c,v 1.4 2013/10/19 17:45:00 christos Exp $ */ +/* $NetBSD: t_fmemopen.c,v 1.5 2021/07/10 07:50:33 christos Exp $ */ /*- * Copyright (c)2010 Takehiko NOZAKI, @@ -964,7 +964,8 @@ ATF_TC_BODY(test19, tc) /* don't accept non nul character at end of buffer */ ATF_CHECK(fputc(0x1, fp) == EOF); - ATF_CHECK(ftello(fp) == (off_t)t->n); + ATF_CHECK_MSG(ftello(fp) == (off_t)t->n, +"%td != %td", ftello(fp), (off_t)t->n); ATF_CHECK(feof(fp) == 0); /* accept nul character at end of buffer */
CVS commit: src/tests/lib/libc/stdio
Module Name:src
Committed By: christos
Date: Sat Jul 10 07:50:20 UTC 2021
Modified Files:
src/tests/lib/libc/stdio: h_intr.c
Log Message:
space before star
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/stdio/h_intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/stdio/h_intr.c
diff -u src/tests/lib/libc/stdio/h_intr.c:1.4 src/tests/lib/libc/stdio/h_intr.c:1.5
--- src/tests/lib/libc/stdio/h_intr.c:1.4 Fri Jul 9 16:00:26 2021
+++ src/tests/lib/libc/stdio/h_intr.c Sat Jul 10 03:50:20 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: h_intr.c,v 1.4 2021/07/09 20:00:26 kre Exp $ */
+/* $NetBSD: h_intr.c,v 1.5 2021/07/10 07:50:20 christos Exp $ */
/**
* Test of interrupted I/O to popen()ed commands.
@@ -25,7 +25,7 @@
*/
#include
-__RCSID("$NetBSD: h_intr.c,v 1.4 2021/07/09 20:00:26 kre Exp $");
+__RCSID("$NetBSD: h_intr.c,v 1.5 2021/07/10 07:50:20 christos Exp $");
#include
#include
@@ -48,12 +48,12 @@ static int rndmode(void);
static sig_t xsignal(int signo, sig_t handler);
static void alarmtimer(int wait);
static void pr_star(int signo);
-static int do_opts(int argc, char* argv[]);
+static int do_opts(int argc, char *argv[]);
static void usage(FILE *fp);
/* Globals */
static struct options {
- const char* cmd; /* cmd to run (which must read from stdin) */
+ const char *cmd; /* cmd to run (which must read from stdin) */
size_t bsize; /* block size to use */
size_t asize; /* alt. stdio buffer size */
int btype; /* buffering type: _IONBF, ... */
@@ -74,8 +74,8 @@ static const struct {
static void (*alarm_fn)(int);/* real/dummy alarm fn. */
static int (*sintr_fn)(int, int); /* " siginterrupt fn. */
-static ssize_t (*rd_fn)(FILE*, void*, size_t); /* read fn. */
-static ssize_t (*wr_fn)(FILE*, const void*, size_t); /* write fn. */
+static ssize_t (*rd_fn)(FILE *, void *, size_t); /* read fn. */
+static ssize_t (*wr_fn)(FILE *, const void *, size_t); /* write fn. */
enum {
MB = 1024 * 1024, /* a megabyte */
@@ -91,7 +91,7 @@ enum {
* M A I N
*/
int
-main(int argc, char* argv[])
+main(int argc, char *argv[])
{
int i, rc = EXIT_SUCCESS;
@@ -205,9 +205,9 @@ fail:
* maxread - syscall version
*/
ssize_t
-smaxread(FILE* fp, void* buf, size_t size)
+smaxread(FILE* fp, void *buf, size_t size)
{
- char* p = buf;
+ char *p = buf;
ssize_t nrd = 0;
ssize_t n;
@@ -231,9 +231,9 @@ smaxread(FILE* fp, void* buf, size_t siz
* maxread - stdio version
*/
ssize_t
-maxread(FILE* fp, void* buf, size_t size)
+maxread(FILE* fp, void *buf, size_t size)
{
- char* p = buf;
+ char *p = buf;
ssize_t nrd = 0;
size_t n;
@@ -262,9 +262,9 @@ maxread(FILE* fp, void* buf, size_t size
* maxwrite - syscall version
*/
ssize_t
-smaxwrite(FILE* fp, const void* buf, size_t size)
+smaxwrite(FILE* fp, const void *buf, size_t size)
{
- const char* p = buf;
+ const char *p = buf;
ssize_t nwr = 0;
ssize_t n;
@@ -287,9 +287,9 @@ smaxwrite(FILE* fp, const void* buf, siz
* maxwrite - stdio version (warning: substrate may be buggy)
*/
ssize_t
-maxwrite(FILE* fp, const void* buf, size_t size)
+maxwrite(FILE* fp, const void *buf, size_t size)
{
- const char* p = buf;
+ const char *p = buf;
ssize_t nwr = 0;
size_t n;
@@ -412,7 +412,7 @@ btype2str(int val)
}
static int
-str2btype(const char* s)
+str2btype(const char *s)
{
for (size_t i = 0; i < __arraycount(btypes); i++)
if (strcmp(btypes[i].name, s) == 0)
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: skrll Date: Sat Jul 10 06:53:40 UTC 2021 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_add_16.S atomic_add_32.S atomic_add_64.S atomic_add_8.S atomic_and_16.S atomic_and_32.S atomic_and_64.S atomic_and_8.S atomic_dec_32.S atomic_dec_64.S atomic_inc_32.S atomic_inc_64.S atomic_nand_16.S atomic_nand_32.S atomic_nand_64.S atomic_nand_8.S atomic_or_16.S atomic_or_32.S atomic_or_64.S atomic_or_8.S atomic_sub_64.S atomic_swap.S atomic_swap_16.S atomic_xor_16.S atomic_xor_32.S atomic_xor_64.S atomic_xor_8.S membar_ops.S Log Message: s/ifdef _ARM_ARCH_6/if defined(_ARM_ARCH_6)/ for consistency. NFCI. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/arm/atomic/atomic_add_16.S \ src/common/lib/libc/arch/arm/atomic/atomic_add_8.S \ src/common/lib/libc/arch/arm/atomic/atomic_and_16.S \ src/common/lib/libc/arch/arm/atomic/atomic_and_8.S \ src/common/lib/libc/arch/arm/atomic/atomic_nand_16.S \ src/common/lib/libc/arch/arm/atomic/atomic_nand_32.S \ src/common/lib/libc/arch/arm/atomic/atomic_nand_8.S \ src/common/lib/libc/arch/arm/atomic/atomic_or_16.S \ src/common/lib/libc/arch/arm/atomic/atomic_or_8.S \ src/common/lib/libc/arch/arm/atomic/atomic_sub_64.S \ src/common/lib/libc/arch/arm/atomic/atomic_xor_16.S \ src/common/lib/libc/arch/arm/atomic/atomic_xor_32.S \ src/common/lib/libc/arch/arm/atomic/atomic_xor_8.S cvs rdiff -u -r1.8 -r1.9 src/common/lib/libc/arch/arm/atomic/atomic_add_32.S \ src/common/lib/libc/arch/arm/atomic/atomic_and_32.S \ src/common/lib/libc/arch/arm/atomic/atomic_or_32.S cvs rdiff -u -r1.12 -r1.13 \ src/common/lib/libc/arch/arm/atomic/atomic_add_64.S \ src/common/lib/libc/arch/arm/atomic/atomic_or_64.S cvs rdiff -u -r1.11 -r1.12 \ src/common/lib/libc/arch/arm/atomic/atomic_and_64.S cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/arch/arm/atomic/atomic_dec_32.S \ src/common/lib/libc/arch/arm/atomic/atomic_nand_64.S \ src/common/lib/libc/arch/arm/atomic/atomic_swap_16.S \ src/common/lib/libc/arch/arm/atomic/atomic_xor_64.S cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/arm/atomic/atomic_dec_64.S \ src/common/lib/libc/arch/arm/atomic/atomic_inc_32.S \ src/common/lib/libc/arch/arm/atomic/membar_ops.S cvs rdiff -u -r1.9 -r1.10 src/common/lib/libc/arch/arm/atomic/atomic_inc_64.S cvs rdiff -u -r1.17 -r1.18 src/common/lib/libc/arch/arm/atomic/atomic_swap.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/arm/atomic/atomic_add_16.S diff -u src/common/lib/libc/arch/arm/atomic/atomic_add_16.S:1.3 src/common/lib/libc/arch/arm/atomic/atomic_add_16.S:1.4 --- src/common/lib/libc/arch/arm/atomic/atomic_add_16.S:1.3 Mon Jun 23 21:53:45 2014 +++ src/common/lib/libc/arch/arm/atomic/atomic_add_16.S Sat Jul 10 06:53:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_add_16.S,v 1.3 2014/06/23 21:53:45 joerg Exp $ */ +/* $NetBSD: atomic_add_16.S,v 1.4 2021/07/10 06:53:40 skrll Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include "atomic_op_asm.h" -#ifdef _ARM_ARCH_6 +#if defined(_ARM_ARCH_6) ENTRY_NP(_atomic_sub_16) negs r1, r1 Index: src/common/lib/libc/arch/arm/atomic/atomic_add_8.S diff -u src/common/lib/libc/arch/arm/atomic/atomic_add_8.S:1.3 src/common/lib/libc/arch/arm/atomic/atomic_add_8.S:1.4 --- src/common/lib/libc/arch/arm/atomic/atomic_add_8.S:1.3 Mon Jun 23 21:53:45 2014 +++ src/common/lib/libc/arch/arm/atomic/atomic_add_8.S Sat Jul 10 06:53:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_add_8.S,v 1.3 2014/06/23 21:53:45 joerg Exp $ */ +/* $NetBSD: atomic_add_8.S,v 1.4 2021/07/10 06:53:40 skrll Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include "atomic_op_asm.h" -#ifdef _ARM_ARCH_6 +#if defined(_ARM_ARCH_6) ENTRY_NP(_atomic_sub_8) negs r1, r1 Index: src/common/lib/libc/arch/arm/atomic/atomic_and_16.S diff -u src/common/lib/libc/arch/arm/atomic/atomic_and_16.S:1.3 src/common/lib/libc/arch/arm/atomic/atomic_and_16.S:1.4 --- src/common/lib/libc/arch/arm/atomic/atomic_and_16.S:1.3 Mon Jun 23 21:53:45 2014 +++ src/common/lib/libc/arch/arm/atomic/atomic_and_16.S Sat Jul 10 06:53:40 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_and_16.S,v 1.3 2014/06/23 21:53:45 joerg Exp $ */ +/* $NetBSD: atomic_and_16.S,v 1.4 2021/07/10 06:53:40 skrll Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include "atomic_op_asm.h" -#ifdef _ARM_ARCH_6 +#if defined(_ARM_ARCH_6) ENTRY_NP(_atomic_and_16) mov ip, r0 Index: src/common/lib/libc/arch/arm/atomic/atomic_and_8.S diff -u src/common/lib/libc/arch/arm/atomic/atomic_and_8.S:1.3 src/common/lib/libc/arch/arm/atomic/atomic_and_8.S:1.4 ---
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Sat Jul 10 06:01:41 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: decl_arg.c msg_124.c
Log Message:
tests/lint: move test for __attribute__ out of msg_124.c
That test case didn't belong there since there was no chance of getting
an 'illegal pointer combination' by applying an operator.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.bin/xlint/lint1/decl_arg.c
cvs rdiff -u -r1.9 -r1.10 src/tests/usr.bin/xlint/lint1/msg_124.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/decl_arg.c
diff -u src/tests/usr.bin/xlint/lint1/decl_arg.c:1.1 src/tests/usr.bin/xlint/lint1/decl_arg.c:1.2
--- src/tests/usr.bin/xlint/lint1/decl_arg.c:1.1 Fri Jul 9 20:20:03 2021
+++ src/tests/usr.bin/xlint/lint1/decl_arg.c Sat Jul 10 06:01:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl_arg.c,v 1.1 2021/07/09 20:20:03 rillig Exp $ */
+/* $NetBSD: decl_arg.c,v 1.2 2021/07/10 06:01:41 rillig Exp $ */
# 3 "decl_arg.c"
/*
@@ -91,3 +91,8 @@ const
{
return arg;
}
+
+void test_varargs_attribute(
+void (*pr)(const char *, ...)
+ __attribute__((__format__(__printf__, 1, 2)))
+);
Index: src/tests/usr.bin/xlint/lint1/msg_124.c
diff -u src/tests/usr.bin/xlint/lint1/msg_124.c:1.9 src/tests/usr.bin/xlint/lint1/msg_124.c:1.10
--- src/tests/usr.bin/xlint/lint1/msg_124.c:1.9 Tue Apr 13 22:21:19 2021
+++ src/tests/usr.bin/xlint/lint1/msg_124.c Sat Jul 10 06:01:41 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_124.c,v 1.9 2021/04/13 22:21:19 christos Exp $ */
+/* $NetBSD: msg_124.c,v 1.10 2021/07/10 06:01:41 rillig Exp $ */
# 3 "msg_124.c"
// Test for message: illegal pointer combination (%s) and (%s), op %s [124]
@@ -49,6 +49,3 @@ compare_pointers(const void *vp, const c
ok(ip == 0L);
ok(fp == 0L);
}
-
-void test_varargs_attribute(void (*pr)(const char *, ...) __attribute__((__format__(__printf__, 1, 2;
-
