CVS commit: src/games/gomoku
Module Name:src Committed By: rillig Date: Sat May 28 05:44:41 UTC 2022 Modified Files: src/games/gomoku: makemove.c Log Message: gomoku: extract separate function update_overlap_same_direction No functional change. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/games/gomoku/makemove.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/gomoku
Module Name:src
Committed By: rillig
Date: Sat May 28 05:44:41 UTC 2022
Modified Files:
src/games/gomoku: makemove.c
Log Message:
gomoku: extract separate function update_overlap_same_direction
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/games/gomoku/makemove.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/gomoku/makemove.c
diff -u src/games/gomoku/makemove.c:1.27 src/games/gomoku/makemove.c:1.28
--- src/games/gomoku/makemove.c:1.27 Sat May 28 05:14:34 2022
+++ src/games/gomoku/makemove.c Sat May 28 05:44:41 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: makemove.c,v 1.27 2022/05/28 05:14:34 rillig Exp $ */
+/* $NetBSD: makemove.c,v 1.28 2022/05/28 05:44:41 rillig Exp $ */
/*
* Copyright (c) 1994
@@ -34,7 +34,7 @@
#include
/* @(#)makemove.c 8.2 (Berkeley) 5/3/95 */
-__RCSID("$NetBSD: makemove.c,v 1.27 2022/05/28 05:14:34 rillig Exp $");
+__RCSID("$NetBSD: makemove.c,v 1.28 2022/05/28 05:44:41 rillig Exp $");
#include "gomoku.h"
@@ -77,10 +77,9 @@ makemove(int us, int mv)
/* compute new frame values */
sp->s_wval = 0;
- struct spotstr *osp = sp;
for (int r = 4; --r >= 0; ) { /* for each direction */
int d = dd[r];
- struct spotstr *fsp = osp;
+ struct spotstr *fsp = [mv];
int bmask = BFLAG << r;
for (int f = 5; --f >= 0; fsp -= d) { /* for each frame */
@@ -198,7 +197,7 @@ makemove(int us, int mv)
;
}
- update_overlap(osp);
+ update_overlap([mv]);
/*
* TODO: Declare a tie as soon as all frames are blocked. This is
@@ -210,8 +209,52 @@ makemove(int us, int mv)
return MOVEOK;
}
+static void
+update_overlap_same_direction(const struct spotstr *sp1,
+ const struct spotstr *sp2,
+ int a, int d, int i_minus_f, int r)
+{
+ /*
+ * count the number of empty spots to see if there is
+ * still an overlap.
+ */
+ int n = 0;
+ const struct spotstr *sp = sp1;
+ const struct spotstr *esp = NULL;
+ for (int b = i_minus_f; b < 5; b++, sp += d) {
+ if (sp->s_occ == EMPTY) {
+ esp = sp; /* save the intersection point */
+ n++;
+ }
+ }
+
+ int b = (int)(sp2->s_frame[r] - frames);
+ if (n == 0) {
+ if (sp->s_occ == EMPTY) {
+ overlap[a * FAREA + b] &= 0xA;
+ overlap[b * FAREA + a] &= 0xC;
+ intersect[a * FAREA + b] = (short)(sp - board);
+ intersect[b * FAREA + a] = (short)(sp - board);
+ } else {
+ overlap[a * FAREA + b] = 0;
+ overlap[b * FAREA + a] = 0;
+ }
+ } else if (n == 1) {
+ if (sp->s_occ == EMPTY) {
+ overlap[a * FAREA + b] &= 0xAF;
+ overlap[b * FAREA + a] &= 0xCF;
+ } else {
+ overlap[a * FAREA + b] &= 0xF;
+ overlap[b * FAREA + a] &= 0xF;
+ }
+ intersect[a * FAREA + b] = (short)(esp - board);
+ intersect[b * FAREA + a] = (short)(esp - board);
+ }
+ /* else no change, still multiple overlap */
+}
+
/*
- * fix up the overlap array due to updating spot osp.
+ * fix up the overlap array according to the changed 'osp'.
*/
static void
update_overlap(struct spotstr *osp)
@@ -221,11 +264,13 @@ update_overlap(struct spotstr *osp)
int d = dd[r];
struct spotstr *sp1 = osp;
- for (int f = 0; f < 6; f++, sp1 -= d) { /* for each frame */
+ /* for each frame that contains 'osp' */
+ for (int f = 0; f < 6; f++, sp1 -= d) {
if (sp1->s_occ == BORDER)
break;
if ((sp1->s_flags & BFLAG << r) != 0)
continue;
+
/*
* Update all other frames that intersect the current one
* to indicate whether they still overlap or not.
@@ -242,43 +287,7 @@ update_overlap(struct spotstr *osp)
if ((sp2->s_flags & BFLAG << r) != 0)
continue;
- /*
- * count the number of empty spots to see if there is
- * still an overlap.
- */
- int n = 0;
- struct spotstr *sp = sp1;
- struct spotstr *esp = NULL;
- for (int b = i - f; b < 5; b++, sp += d) {
- if (sp->s_occ == EMPTY) {
- esp = sp; /* save the intersection point */
- n++;
- }
- }
-
- int b = (int)(sp2->s_frame[r] - frames);
- if (n == 0) {
- if (sp->s_occ == EMPTY) {
- overlap[a * FAREA + b] &= 0xA;
- overlap[b * FAREA + a] &= 0xC;
- intersect[a * FAREA + b] = (short)(sp - board);
- intersect[b * FAREA + a] = (short)(sp - board);
- } else {
- overlap[a * FAREA + b] = 0;
- overlap[b * FAREA + a] = 0;
- }
- } else if (n == 1) {
- if (sp->s_occ == EMPTY) {
- overlap[a * FAREA + b] &= 0xAF;
- overlap[b * FAREA + a] &= 0xCF;
- } else {
- overlap[a * FAREA + b] &= 0xF;
- overlap[b * FAREA + a] &= 0xF;
- }
- intersect[a * FAREA + b] = (short)(esp - board);
- intersect[b * FAREA + a] = (short)(esp - board);
- }
- /* else no change, still multiple overlap */
+ update_overlap_same_direction(sp1, sp2, a, d, i - f, r);
}
/* the other directions can only intersect at spot osp */
CVS commit: src/games/gomoku
Module Name:src Committed By: rillig Date: Sat May 28 05:14:34 UTC 2022 Modified Files: src/games/gomoku: makemove.c Log Message: gomoku: reduce number of variables in update_overlap No functional change. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/games/gomoku/makemove.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/gomoku
Module Name:src
Committed By: rillig
Date: Sat May 28 05:14:34 UTC 2022
Modified Files:
src/games/gomoku: makemove.c
Log Message:
gomoku: reduce number of variables in update_overlap
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/games/gomoku/makemove.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/gomoku/makemove.c
diff -u src/games/gomoku/makemove.c:1.26 src/games/gomoku/makemove.c:1.27
--- src/games/gomoku/makemove.c:1.26 Sat May 28 04:52:23 2022
+++ src/games/gomoku/makemove.c Sat May 28 05:14:34 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: makemove.c,v 1.26 2022/05/28 04:52:23 rillig Exp $ */
+/* $NetBSD: makemove.c,v 1.27 2022/05/28 05:14:34 rillig Exp $ */
/*
* Copyright (c) 1994
@@ -34,7 +34,7 @@
#include
/* @(#)makemove.c 8.2 (Berkeley) 5/3/95 */
-__RCSID("$NetBSD: makemove.c,v 1.26 2022/05/28 04:52:23 rillig Exp $");
+__RCSID("$NetBSD: makemove.c,v 1.27 2022/05/28 05:14:34 rillig Exp $");
#include "gomoku.h"
@@ -220,12 +220,11 @@ update_overlap(struct spotstr *osp)
for (int r = 4; --r >= 0; ) { /* for each direction */
int d = dd[r];
struct spotstr *sp1 = osp;
- int bmask = BFLAG << r;
for (int f = 0; f < 6; f++, sp1 -= d) { /* for each frame */
if (sp1->s_occ == BORDER)
break;
- if ((sp1->s_flags & bmask) != 0)
+ if ((sp1->s_flags & BFLAG << r) != 0)
continue;
/*
* Update all other frames that intersect the current one
@@ -235,13 +234,12 @@ update_overlap(struct spotstr *osp)
* since the two frames can overlap at more than one point.
*/
int a = (int)(sp1->s_frame[r] - frames);
- u_char *str = [a * FAREA];
struct spotstr *sp2 = sp1 - d;
for (int i = f + 1; i < 6; i++, sp2 -= d) {
if (sp2->s_occ == BORDER)
break;
- if ((sp2->s_flags & bmask) != 0)
+ if ((sp2->s_flags & BFLAG << r) != 0)
continue;
/*
@@ -261,20 +259,20 @@ update_overlap(struct spotstr *osp)
int b = (int)(sp2->s_frame[r] - frames);
if (n == 0) {
if (sp->s_occ == EMPTY) {
- str[b] &= 0xA;
+ overlap[a * FAREA + b] &= 0xA;
overlap[b * FAREA + a] &= 0xC;
intersect[a * FAREA + b] = (short)(sp - board);
intersect[b * FAREA + a] = (short)(sp - board);
} else {
- str[b] = 0;
+ overlap[a * FAREA + b] = 0;
overlap[b * FAREA + a] = 0;
}
} else if (n == 1) {
if (sp->s_occ == EMPTY) {
- str[b] &= 0xAF;
+ overlap[a * FAREA + b] &= 0xAF;
overlap[b * FAREA + a] &= 0xCF;
} else {
- str[b] &= 0xF;
+ overlap[a * FAREA + b] &= 0xF;
overlap[b * FAREA + a] &= 0xF;
}
intersect[a * FAREA + b] = (short)(esp - board);
@@ -286,15 +284,14 @@ update_overlap(struct spotstr *osp)
/* the other directions can only intersect at spot osp */
for (int r1 = r; --r1 >= 0; ) {
int d1 = dd[r1];
- int bmask1 = BFLAG << r1;
struct spotstr *sp = osp;
for (int i = 6; --i >= 0; sp -= d1) { /* for each spot */
if (sp->s_occ == BORDER)
break;
- if ((sp->s_flags & bmask1) != 0)
+ if ((sp->s_flags & BFLAG << r1) != 0)
continue;
int b = (int)(sp->s_frame[r1] - frames);
- str[b] = 0;
+ overlap[a * FAREA + b] = 0;
overlap[b * FAREA + a] = 0;
}
}
CVS commit: src/games/gomoku
Module Name:src
Committed By: rillig
Date: Sat May 28 04:52:23 UTC 2022
Modified Files:
src/games/gomoku: makemove.c
Log Message:
gomoku: reduce scope of local variable
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/games/gomoku/makemove.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/gomoku/makemove.c
diff -u src/games/gomoku/makemove.c:1.25 src/games/gomoku/makemove.c:1.26
--- src/games/gomoku/makemove.c:1.25 Fri May 27 23:29:15 2022
+++ src/games/gomoku/makemove.c Sat May 28 04:52:23 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: makemove.c,v 1.25 2022/05/27 23:29:15 rillig Exp $ */
+/* $NetBSD: makemove.c,v 1.26 2022/05/28 04:52:23 rillig Exp $ */
/*
* Copyright (c) 1994
@@ -34,7 +34,7 @@
#include
/* @(#)makemove.c 8.2 (Berkeley) 5/3/95 */
-__RCSID("$NetBSD: makemove.c,v 1.25 2022/05/27 23:29:15 rillig Exp $");
+__RCSID("$NetBSD: makemove.c,v 1.26 2022/05/28 04:52:23 rillig Exp $");
#include "gomoku.h"
@@ -217,7 +217,6 @@ static void
update_overlap(struct spotstr *osp)
{
- struct spotstr *esp = NULL;
for (int r = 4; --r >= 0; ) { /* for each direction */
int d = dd[r];
struct spotstr *sp1 = osp;
@@ -251,12 +250,14 @@ update_overlap(struct spotstr *osp)
*/
int n = 0;
struct spotstr *sp = sp1;
+ struct spotstr *esp = NULL;
for (int b = i - f; b < 5; b++, sp += d) {
if (sp->s_occ == EMPTY) {
esp = sp; /* save the intersection point */
n++;
}
}
+
int b = (int)(sp2->s_frame[r] - frames);
if (n == 0) {
if (sp->s_occ == EMPTY) {
CVS commit: src/games/gomoku
Module Name:src Committed By: rillig Date: Sat May 28 04:52:23 UTC 2022 Modified Files: src/games/gomoku: makemove.c Log Message: gomoku: reduce scope of local variable No functional change. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/games/gomoku/makemove.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2
Module Name:src
Committed By: manu
Date: Sat May 28 01:07:47 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_bios.c radeon_drv.h
src/sys/external/bsd/drm2/include/linux: acpi.h
Log Message:
Let radeon DRM driver build on ports that lack ACPI
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/include/linux/acpi.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/external/bsd/drm2/dist/drm/radeon/radeon_bios.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.11 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.12
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c:1.11 Mon Feb 28 17:15:29 2022
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c Sat May 28 01:07:47 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_bios.c,v 1.11 2022/02/28 17:15:29 riastradh Exp $ */
+/* $NetBSD: radeon_bios.c,v 1.12 2022/05/28 01:07:47 manu Exp $ */
/*
* Copyright 2008 Advanced Micro Devices, Inc.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.11 2022/02/28 17:15:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_bios.c,v 1.12 2022/05/28 01:07:47 manu Exp $");
#include
#include
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: radeon_bios.
#include "radeon.h"
#include "radeon_reg.h"
-#ifdef __NetBSD__
+#if defined(__NetBSD__) && NACPICA > 0
#include
#define _COMPONENT ACPI_DISPLAY_COMPONENT
ACPI_MODULE_NAME("radeon_acpi")
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h:1.3 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h:1.4
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h:1.3 Sat Dec 18 23:45:43 2021
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h Sat May 28 01:07:47 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_drv.h,v 1.3 2021/12/18 23:45:43 riastradh Exp $ */
+/* $NetBSD: radeon_drv.h,v 1.4 2022/05/28 01:07:47 manu Exp $ */
/* radeon_drv.h -- Private header for radeon driver -*- linux-c -*-
*
@@ -33,6 +33,15 @@
#ifndef __RADEON_DRV_H__
#define __RADEON_DRV_H__
+#if defined(__NetBSD__)
+#ifdef _KERNEL_OPT
+#include "acpica.h"
+#endif /* _KERNEL_OPT */
+#if (NACPICA > 0)
+#define CONFIG_ACPI
+#endif /* NACPICA > 0 */
+#endif /* __NetBSD__ */
+
#include
#include
#include
Index: src/sys/external/bsd/drm2/include/linux/acpi.h
diff -u src/sys/external/bsd/drm2/include/linux/acpi.h:1.9 src/sys/external/bsd/drm2/include/linux/acpi.h:1.10
--- src/sys/external/bsd/drm2/include/linux/acpi.h:1.9 Sun Feb 27 14:22:50 2022
+++ src/sys/external/bsd/drm2/include/linux/acpi.h Sat May 28 01:07:47 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.h,v 1.9 2022/02/27 14:22:50 riastradh Exp $ */
+/* $NetBSD: acpi.h,v 1.10 2022/05/28 01:07:47 manu Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -38,7 +38,6 @@
#if NACPICA > 0
#include
-#endif
#include
#include
@@ -58,4 +57,5 @@ union acpi_object *acpi_evaluate_dsm_typ
uint64_t, uint64_t, union acpi_object *, acpi_object_type);
bool acpi_check_dsm(acpi_handle, const guid_t *, uint64_t, uint64_t);
+#endif /* NACPICA > 0 */
#endif /* _LINUX_ACPI_H_ */
CVS commit: src/sys/external/bsd/drm2
Module Name:src Committed By: manu Date: Sat May 28 01:07:47 UTC 2022 Modified Files: src/sys/external/bsd/drm2/dist/drm/radeon: radeon_bios.c radeon_drv.h src/sys/external/bsd/drm2/include/linux: acpi.h Log Message: Let radeon DRM driver build on ports that lack ACPI To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/drm2/include/linux/acpi.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: manu Date: Sat May 28 00:53:41 UTC 2022 Modified Files: src/share/man/man4: wm.4 Log Message: Document hw.wmX.txex_workqueue sysctl To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/share/man/man4/wm.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/wm.4 diff -u src/share/man/man4/wm.4:1.42 src/share/man/man4/wm.4:1.43 --- src/share/man/man4/wm.4:1.42 Wed Feb 17 08:15:43 2021 +++ src/share/man/man4/wm.4 Sat May 28 00:53:41 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: wm.4,v 1.42 2021/02/17 08:15:43 knakahara Exp $ +.\" $NetBSD: wm.4,v 1.43 2022/05/28 00:53:41 manu Exp $ .\" .\" Copyright 2002, 2003 Wasabi Systems, Inc. .\" All rights reserved. @@ -184,6 +184,16 @@ utility configures the adapter to receiv .\" .Sh DIAGNOSTICS .\" XXX to be done. .Sh OPTIONS +The driver default behavior is to handle packets in interrupt context, +which reduces the CPU time available to user processes when under +heavy nerwork load. The +.Em hw.wmX.txrx_workqueue +.Xr sysctl 8 +alters this behavior so that packets are handled by a kernel thread, +which executes at a lower priority. This gives user processes more +opportunity to be executed, at the exepense of network throughput. +.Pp +The following options can be set at build time: .Bl -tag -width WM_RX_INTR_PROCESS_LIMIT_DEFAULT -offset 3n .It Dv WM_RX_PROCESS_LIMIT_DEFAULT The maximum number of received packets processed in each @@ -247,7 +257,8 @@ to .Xr mii 4 , .Xr netintro 4 , .Xr pci 4 , -.Xr ifconfig 8 +.Xr ifconfig 8 , +.Xr sysctl 8 .Sh HISTORY The .Nm
CVS commit: src/share/man/man4
Module Name:src Committed By: manu Date: Sat May 28 00:53:41 UTC 2022 Modified Files: src/share/man/man4: wm.4 Log Message: Document hw.wmX.txex_workqueue sysctl To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/share/man/man4/wm.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/gomoku
Module Name:src
Committed By: rillig
Date: Fri May 27 23:29:16 UTC 2022
Modified Files:
src/games/gomoku: makemove.c
Log Message:
gomoku: reduce variable reuse, make code more uniform
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/games/gomoku/makemove.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/gomoku/makemove.c
diff -u src/games/gomoku/makemove.c:1.24 src/games/gomoku/makemove.c:1.25
--- src/games/gomoku/makemove.c:1.24 Fri May 27 23:10:54 2022
+++ src/games/gomoku/makemove.c Fri May 27 23:29:15 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: makemove.c,v 1.24 2022/05/27 23:10:54 rillig Exp $ */
+/* $NetBSD: makemove.c,v 1.25 2022/05/27 23:29:15 rillig Exp $ */
/*
* Copyright (c) 1994
@@ -34,7 +34,7 @@
#include
/* @(#)makemove.c 8.2 (Berkeley) 5/3/95 */
-__RCSID("$NetBSD: makemove.c,v 1.24 2022/05/27 23:10:54 rillig Exp $");
+__RCSID("$NetBSD: makemove.c,v 1.25 2022/05/27 23:29:15 rillig Exp $");
#include "gomoku.h"
@@ -101,16 +101,12 @@ makemove(int us, int mv)
}
/* compute old weight value for this frame */
- union comboval *cp = >s_fval[BLACK][r];
-
- int val;
- if (cp->s <= 0x500)
- val = weight[5 - cp->cv_force - cp->cv_win];
- else
- val = 0;
- cp = >s_fval[WHITE][r];
- if (cp->s <= 0x500)
- val += weight[5 - cp->cv_force - cp->cv_win];
+ union comboval cb;
+ int val = 0;
+ if ((cb = fsp->s_fval[BLACK][r]).s <= 0x500)
+ val += weight[5 - cb.cv_force - cb.cv_win];
+ if ((cb = fsp->s_fval[WHITE][r]).s <= 0x500)
+ val += weight[5 - cb.cv_force - cb.cv_win];
/* compute new combo value for this frame */
bool space = fsp->s_occ == EMPTY;
@@ -141,7 +137,7 @@ makemove(int us, int mv)
/* compute new value & combo number for this frame & color */
fsp->s_fval[us != BLACK ? BLACK : WHITE][r].s = 0x600;
- cp = >s_fval[us][r];
+ union comboval *cp = >s_fval[us][r];
/* both ends open? */
if (space && sp->s_occ == EMPTY) {
cp->cv_force = 4 - n;
@@ -266,8 +262,8 @@ update_overlap(struct spotstr *osp)
if (sp->s_occ == EMPTY) {
str[b] &= 0xA;
overlap[b * FAREA + a] &= 0xC;
- intersect[a * FAREA + b] = n = (int)(sp - board);
- intersect[b * FAREA + a] = n;
+ intersect[a * FAREA + b] = (short)(sp - board);
+ intersect[b * FAREA + a] = (short)(sp - board);
} else {
str[b] = 0;
overlap[b * FAREA + a] = 0;
@@ -280,8 +276,8 @@ update_overlap(struct spotstr *osp)
str[b] &= 0xF;
overlap[b * FAREA + a] &= 0xF;
}
- intersect[a * FAREA + b] = n = (int)(esp - board);
- intersect[b * FAREA + a] = n;
+ intersect[a * FAREA + b] = (short)(esp - board);
+ intersect[b * FAREA + a] = (short)(esp - board);
}
/* else no change, still multiple overlap */
}
CVS commit: src/games/gomoku
Module Name:src Committed By: rillig Date: Fri May 27 23:29:16 UTC 2022 Modified Files: src/games/gomoku: makemove.c Log Message: gomoku: reduce variable reuse, make code more uniform No functional change. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/games/gomoku/makemove.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/gomoku
Module Name:src
Committed By: rillig
Date: Fri May 27 23:10:54 UTC 2022
Modified Files:
src/games/gomoku: gomoku.h makemove.c pickmove.c
Log Message:
gomoku: reduce scope of local variables
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/games/gomoku/gomoku.h
cvs rdiff -u -r1.23 -r1.24 src/games/gomoku/makemove.c
cvs rdiff -u -r1.45 -r1.46 src/games/gomoku/pickmove.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/gomoku/gomoku.h
diff -u src/games/gomoku/gomoku.h:1.40 src/games/gomoku/gomoku.h:1.41
--- src/games/gomoku/gomoku.h:1.40 Fri May 27 19:59:56 2022
+++ src/games/gomoku/gomoku.h Fri May 27 23:10:54 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: gomoku.h,v 1.40 2022/05/27 19:59:56 rillig Exp $ */
+/* $NetBSD: gomoku.h,v 1.41 2022/05/27 23:10:54 rillig Exp $ */
/*
* Copyright (c) 1994
@@ -53,11 +53,6 @@
*/
#define FAREA (2 * BSZ * (BSZ - 4) + 2 * (BSZ - 4) * (BSZ - 4))
-#define MUP (BSZ + 1)
-#define MDOWN (-(BSZ + 1))
-#define MLEFT (-1)
-#define MRIGHT (1)
-
/* values for s_occ */
#define BLACK 0
#define WHITE 1
Index: src/games/gomoku/makemove.c
diff -u src/games/gomoku/makemove.c:1.23 src/games/gomoku/makemove.c:1.24
--- src/games/gomoku/makemove.c:1.23 Fri May 27 20:48:42 2022
+++ src/games/gomoku/makemove.c Fri May 27 23:10:54 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: makemove.c,v 1.23 2022/05/27 20:48:42 rillig Exp $ */
+/* $NetBSD: makemove.c,v 1.24 2022/05/27 23:10:54 rillig Exp $ */
/*
* Copyright (c) 1994
@@ -34,13 +34,16 @@
#include
/* @(#)makemove.c 8.2 (Berkeley) 5/3/95 */
-__RCSID("$NetBSD: makemove.c,v 1.23 2022/05/27 20:48:42 rillig Exp $");
+__RCSID("$NetBSD: makemove.c,v 1.24 2022/05/27 23:10:54 rillig Exp $");
#include "gomoku.h"
/* direction deltas */
const int dd[4] = {
- MRIGHT, MRIGHT+MDOWN, MDOWN, MDOWN+MLEFT
+ 1, /* right */
+ -(BSZ + 1) + 1, /* down + right */
+ -(BSZ + 1), /* down */
+ -(BSZ + 1) - 1 /* down + left */
};
static const int weight[5] = { 0, 1, 7, 22, 100 };
@@ -58,21 +61,13 @@ static void update_overlap(struct spotst
int
makemove(int us, int mv)
{
- struct spotstr *sp, *fsp;
- union comboval *cp;
- struct spotstr *osp;
- struct combostr *cbp, *cbp1;
- union comboval *cp1;
- int d, n;
- int val, bmask;
- bool space;
/* check for end of game */
if (mv == RESIGN)
return RESIGN;
/* check for illegal move */
- sp = [mv];
+ struct spotstr *sp = [mv];
if (sp->s_occ != EMPTY)
return ILLEGAL;
@@ -82,11 +77,12 @@ makemove(int us, int mv)
/* compute new frame values */
sp->s_wval = 0;
- osp = sp;
+ struct spotstr *osp = sp;
for (int r = 4; --r >= 0; ) { /* for each direction */
- d = dd[r];
- fsp = osp;
- bmask = BFLAG << r;
+ int d = dd[r];
+ struct spotstr *fsp = osp;
+ int bmask = BFLAG << r;
+
for (int f = 5; --f >= 0; fsp -= d) { /* for each frame */
if (fsp->s_occ == BORDER)
goto nextr;
@@ -94,7 +90,7 @@ makemove(int us, int mv)
continue;
/* remove this frame from the sorted list of frames */
- cbp = fsp->s_frame[r];
+ struct combostr *cbp = fsp->s_frame[r];
if (cbp->c_next != NULL) {
if (sortframes[BLACK] == cbp)
sortframes[BLACK] = cbp->c_next;
@@ -105,7 +101,9 @@ makemove(int us, int mv)
}
/* compute old weight value for this frame */
- cp = >s_fval[BLACK][r];
+ union comboval *cp = >s_fval[BLACK][r];
+
+ int val;
if (cp->s <= 0x500)
val = weight[5 - cp->cv_force - cp->cv_win];
else
@@ -115,9 +113,9 @@ makemove(int us, int mv)
val += weight[5 - cp->cv_force - cp->cv_win];
/* compute new combo value for this frame */
+ bool space = fsp->s_occ == EMPTY;
+ int n = 0;
sp = fsp;
- space = sp->s_occ == EMPTY;
- n = 0;
for (int i = 5; --i >= 0; sp += d) { /* for each spot */
if (sp->s_occ == us)
n++;
@@ -139,7 +137,7 @@ makemove(int us, int mv)
/* check for game over */
if (n == 5)
- return(WIN);
+ return WIN;
/* compute new value & combo number for this frame & color */
fsp->s_fval[us != BLACK ? BLACK : WHITE][r].s = 0x600;
@@ -159,11 +157,12 @@ makemove(int us, int mv)
sp->s_wval += val;
/* add this frame to the sorted list of frames by combo value */
- cbp1 = sortframes[us];
+ struct combostr *cbp1 = sortframes[us];
if (cbp1 == NULL)
sortframes[us] = cbp->c_next = cbp->c_prev = cbp;
else {
- cp1 = [cbp1->c_vertex].s_fval[us][cbp1->c_dir];
+ union comboval *cp1 =
+ [cbp1->c_vertex].s_fval[us][cbp1->c_dir];
if (cp->s <= cp1->s) {
/* insert at the head of the list */
sortframes[us] = cbp;
@@ -187,7 +186,7 @@ makemove(int us, int mv)
/* both ends open? */
if (fsp->s_occ == EMPTY) {
- cp = >s_fval[BLACK][r];
+ union comboval *cp = >s_fval[BLACK][r];
if (cp->cv_win != 0) {
cp->cv_force++;
cp->cv_win = 0;
@@ -221,17
CVS commit: src/games/gomoku
Module Name:src Committed By: rillig Date: Fri May 27 23:10:54 UTC 2022 Modified Files: src/games/gomoku: gomoku.h makemove.c pickmove.c Log Message: gomoku: reduce scope of local variables No binary change. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/games/gomoku/gomoku.h cvs rdiff -u -r1.23 -r1.24 src/games/gomoku/makemove.c cvs rdiff -u -r1.45 -r1.46 src/games/gomoku/pickmove.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Fri May 27 21:43:26 UTC 2022 Modified Files: src/doc: 3RDPARTY Log Message: gcc 9.5.0 out. To generate a diff of this commit: cvs rdiff -u -r1.1859 -r1.1860 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1859 src/doc/3RDPARTY:1.1860 --- src/doc/3RDPARTY:1.1859 Tue May 24 14:11:15 2022 +++ src/doc/3RDPARTY Fri May 27 21:43:26 2022 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1859 2022/05/24 14:11:15 fcambus Exp $ +# $NetBSD: 3RDPARTY,v 1.1860 2022/05/27 21:43:26 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -451,7 +451,7 @@ There is a flex2netbsd script to help ne Package: gcc Version: 9.3.0/10.3.0 -Current Vers: 9.3.0/10.3.0/11.3.0/12.1.0 +Current Vers: 9.5.0/10.3.0/11.3.0/12.1.0 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/gcc/ Home Page: https://www.gnu.org/software/gcc/
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Fri May 27 21:43:26 UTC 2022 Modified Files: src/doc: 3RDPARTY Log Message: gcc 9.5.0 out. To generate a diff of this commit: cvs rdiff -u -r1.1859 -r1.1860 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src Committed By: riastradh Date: Fri May 27 21:02:27 UTC 2022 Modified Files: src/sys/external/bsd/drm2/dist/drm/i915: i915_utils.h Log Message: i915: Fix missing newlines in custom warning message macros. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/i915/i915_utils.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: riastradh
Date: Fri May 27 21:02:27 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_utils.h
Log Message:
i915: Fix missing newlines in custom warning message macros.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/i915/i915_utils.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/external/bsd/drm2/dist/drm/i915/i915_utils.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_utils.h:1.5 src/sys/external/bsd/drm2/dist/drm/i915/i915_utils.h:1.6
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_utils.h:1.5 Sun Dec 19 11:49:11 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_utils.h Fri May 27 21:02:27 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_utils.h,v 1.5 2021/12/19 11:49:11 riastradh Exp $ */
+/* $NetBSD: i915_utils.h,v 1.6 2022/05/27 21:02:27 riastradh Exp $ */
/*
* Copyright © 2016 Intel Corporation
@@ -44,13 +44,13 @@ struct timer_list;
bool __i915_warn_cond = (x); \
if (__builtin_constant_p(__i915_warn_cond)) \
BUILD_BUG_ON(__i915_warn_cond); \
- WARN(__i915_warn_cond, "WARN_ON(" #x ")"); })
+ WARN(__i915_warn_cond, "WARN_ON(" #x ")\n"); })
#else
-#define WARN_ON(x) WARN((x), "%s", "WARN_ON(" __stringify(x) ")")
+#define WARN_ON(x) WARN((x), "%s\n", "WARN_ON(" __stringify(x) ")")
#endif
#undef WARN_ON_ONCE
-#define WARN_ON_ONCE(x) WARN_ONCE((x), "%s", "WARN_ON_ONCE(" __stringify(x) ")")
+#define WARN_ON_ONCE(x) WARN_ONCE((x), "%s", "WARN_ON_ONCE(" __stringify(x) ")\n")
#define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \
__stringify(x), (long)(x))
CVS commit: src/games/gomoku
Module Name:src
Committed By: rillig
Date: Fri May 27 20:48:43 UTC 2022
Modified Files:
src/games/gomoku: makemove.c
Log Message:
gomoku: allow Black to win the game in the very last move
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/games/gomoku/makemove.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/gomoku/makemove.c
diff -u src/games/gomoku/makemove.c:1.22 src/games/gomoku/makemove.c:1.23
--- src/games/gomoku/makemove.c:1.22 Fri May 27 20:35:58 2022
+++ src/games/gomoku/makemove.c Fri May 27 20:48:42 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: makemove.c,v 1.22 2022/05/27 20:35:58 rillig Exp $ */
+/* $NetBSD: makemove.c,v 1.23 2022/05/27 20:48:42 rillig Exp $ */
/*
* Copyright (c) 1994
@@ -34,7 +34,7 @@
#include
/* @(#)makemove.c 8.2 (Berkeley) 5/3/95 */
-__RCSID("$NetBSD: makemove.c,v 1.22 2022/05/27 20:35:58 rillig Exp $");
+__RCSID("$NetBSD: makemove.c,v 1.23 2022/05/27 20:48:42 rillig Exp $");
#include "gomoku.h"
@@ -80,36 +80,6 @@ makemove(int us, int mv)
sp->s_occ = us;
movelog[nmoves++] = mv;
- /*
- * FIXME: The last spot on the board can still complete a frame.
- *
- * Example game: A1 B1 C1 D1 E1 F1 G1 H1 J1 K1 L1 M1 N1 O1 P1 Q1 R1
- * S1 T1 A2 B2 C2 D2 E2 F2 G2 H2 J2 K2 L2 M2 N2 O2 P2 Q2 R2 S2 T2 A3
- * B3 C3 D3 E3 F3 G3 H3 J3 K3 L3 M3 N3 O3 P3 Q3 R3 S3 T3 A4 B4 C4 D4
- * E4 F4 G4 H4 J4 K4 L4 M4 N4 O4 P4 Q4 R4 S4 T4 B5 C5 D5 E5 F5 G5 H5
- * J5 K5 L5 M5 N5 O5 P5 Q5 R5 S5 T5 B6 C6 D6 E6 F6 G6 H6 J6 K6 L6 M6
- * N6 O6 P6 Q6 R6 S6 T6 B7 C7 D7 E7 F7 G7 H7 J7 K7 L7 M7 N7 O7 P7 Q7
- * R7 S7 T7 A8 B8 C8 D8 E8 F8 G8 H8 J8 K8 L8 M8 N8 O8 P8 Q8 R8 S8 T8
- * A9 B9 C9 D9 E9 F9 G9 H9 J9 K9 L9 M9 N9 O9 P9 Q9 R9 S9 T9 A10 B10
- * C10 D10 E10 F10 G10 H10 J10 K10 L10 M10 N10 O10 P10 Q10 R10 S10
- * T10 B11 C11 D11 E11 F11 G11 H11 J11 K11 L11 M11 N11 O11 P11 Q11
- * R11 S11 T11 B12 C12 D12 E12 F12 G12 H12 J12 K12 L12 M12 N12 O12
- * P12 Q12 R12 S12 T12 B13 C13 D13 E13 F13 G13 H13 J13 K13 L13 M13
- * N13 O13 P13 Q13 R13 S13 T13 A14 B14 C14 D14 E14 F14 G14 H14 J14
- * K14 L14 M14 N14 O14 P14 Q14 R14 S14 T14 A15 B15 C15 D15 E15 F15
- * G15 H15 J15 K15 L15 M15 N15 O15 P15 Q15 R15 S15 T15 A16 B16 C16
- * D16 E16 F16 G16 H16 J16 K16 L16 M16 N16 O16 P16 Q16 R16 S16 T16
- * B17 C17 D17 E17 F17 G17 H17 J17 K17 L17 M17 N17 O17 P17 Q17 R17
- * S17 T17 B18 C18 D18 E18 F18 G18 H18 J18 K18 L18 M18 N18 O18 P18
- * Q18 R18 S18 T18 A11 A5 A12 A6 A13 A7 A18 A17 A19 B19 C19 D19 E19
- * F19 G19 H19 J19 K19 L19 T19 M19 S19 N19 R19 O19 Q19
- *
- * Now P19 is the last remaining spot, and when Black plays there,
- * the frame L19-P19 is complete.
- */
- if (nmoves == BSZ * BSZ)
- return TIE;
-
/* compute new frame values */
sp->s_wval = 0;
osp = sp;
@@ -235,6 +205,13 @@ makemove(int us, int mv)
update_overlap(osp);
+ /*
+ * TODO: Declare a tie as soon as all frames are blocked. This is
+ * usually much earlier than when the whole board is filled.
+ */
+ if (nmoves == BSZ * BSZ)
+ return TIE;
+
return MOVEOK;
}
CVS commit: src/games/gomoku
Module Name:src Committed By: rillig Date: Fri May 27 20:48:43 UTC 2022 Modified Files: src/games/gomoku: makemove.c Log Message: gomoku: allow Black to win the game in the very last move To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/games/gomoku/makemove.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/gomoku
Module Name:src
Committed By: rillig
Date: Fri May 27 20:35:58 UTC 2022
Modified Files:
src/games/gomoku: makemove.c
Log Message:
gomoku: fix off-by-one error when deciding that the game is a tie
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/games/gomoku/makemove.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/gomoku/makemove.c
diff -u src/games/gomoku/makemove.c:1.21 src/games/gomoku/makemove.c:1.22
--- src/games/gomoku/makemove.c:1.21 Fri May 27 19:59:56 2022
+++ src/games/gomoku/makemove.c Fri May 27 20:35:58 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: makemove.c,v 1.21 2022/05/27 19:59:56 rillig Exp $ */
+/* $NetBSD: makemove.c,v 1.22 2022/05/27 20:35:58 rillig Exp $ */
/*
* Copyright (c) 1994
@@ -34,7 +34,7 @@
#include
/* @(#)makemove.c 8.2 (Berkeley) 5/3/95 */
-__RCSID("$NetBSD: makemove.c,v 1.21 2022/05/27 19:59:56 rillig Exp $");
+__RCSID("$NetBSD: makemove.c,v 1.22 2022/05/27 20:35:58 rillig Exp $");
#include "gomoku.h"
@@ -79,7 +79,35 @@ makemove(int us, int mv)
/* make move */
sp->s_occ = us;
movelog[nmoves++] = mv;
- if (nmoves + 1 == BSZ * BSZ) /* FIXME: off-by-one */
+
+ /*
+ * FIXME: The last spot on the board can still complete a frame.
+ *
+ * Example game: A1 B1 C1 D1 E1 F1 G1 H1 J1 K1 L1 M1 N1 O1 P1 Q1 R1
+ * S1 T1 A2 B2 C2 D2 E2 F2 G2 H2 J2 K2 L2 M2 N2 O2 P2 Q2 R2 S2 T2 A3
+ * B3 C3 D3 E3 F3 G3 H3 J3 K3 L3 M3 N3 O3 P3 Q3 R3 S3 T3 A4 B4 C4 D4
+ * E4 F4 G4 H4 J4 K4 L4 M4 N4 O4 P4 Q4 R4 S4 T4 B5 C5 D5 E5 F5 G5 H5
+ * J5 K5 L5 M5 N5 O5 P5 Q5 R5 S5 T5 B6 C6 D6 E6 F6 G6 H6 J6 K6 L6 M6
+ * N6 O6 P6 Q6 R6 S6 T6 B7 C7 D7 E7 F7 G7 H7 J7 K7 L7 M7 N7 O7 P7 Q7
+ * R7 S7 T7 A8 B8 C8 D8 E8 F8 G8 H8 J8 K8 L8 M8 N8 O8 P8 Q8 R8 S8 T8
+ * A9 B9 C9 D9 E9 F9 G9 H9 J9 K9 L9 M9 N9 O9 P9 Q9 R9 S9 T9 A10 B10
+ * C10 D10 E10 F10 G10 H10 J10 K10 L10 M10 N10 O10 P10 Q10 R10 S10
+ * T10 B11 C11 D11 E11 F11 G11 H11 J11 K11 L11 M11 N11 O11 P11 Q11
+ * R11 S11 T11 B12 C12 D12 E12 F12 G12 H12 J12 K12 L12 M12 N12 O12
+ * P12 Q12 R12 S12 T12 B13 C13 D13 E13 F13 G13 H13 J13 K13 L13 M13
+ * N13 O13 P13 Q13 R13 S13 T13 A14 B14 C14 D14 E14 F14 G14 H14 J14
+ * K14 L14 M14 N14 O14 P14 Q14 R14 S14 T14 A15 B15 C15 D15 E15 F15
+ * G15 H15 J15 K15 L15 M15 N15 O15 P15 Q15 R15 S15 T15 A16 B16 C16
+ * D16 E16 F16 G16 H16 J16 K16 L16 M16 N16 O16 P16 Q16 R16 S16 T16
+ * B17 C17 D17 E17 F17 G17 H17 J17 K17 L17 M17 N17 O17 P17 Q17 R17
+ * S17 T17 B18 C18 D18 E18 F18 G18 H18 J18 K18 L18 M18 N18 O18 P18
+ * Q18 R18 S18 T18 A11 A5 A12 A6 A13 A7 A18 A17 A19 B19 C19 D19 E19
+ * F19 G19 H19 J19 K19 L19 T19 M19 S19 N19 R19 O19 Q19
+ *
+ * Now P19 is the last remaining spot, and when Black plays there,
+ * the frame L19-P19 is complete.
+ */
+ if (nmoves == BSZ * BSZ)
return TIE;
/* compute new frame values */
CVS commit: src/games/gomoku
Module Name:src Committed By: rillig Date: Fri May 27 20:35:58 UTC 2022 Modified Files: src/games/gomoku: makemove.c Log Message: gomoku: fix off-by-one error when deciding that the game is a tie To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/games/gomoku/makemove.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/gomoku
Module Name:src Committed By: rillig Date: Fri May 27 19:59:56 UTC 2022 Modified Files: src/games/gomoku: bdinit.c bdisp.c gomoku.h main.c makemove.c pickmove.c Log Message: gomoku: replace 1-based movenum with 0-based nmoves No functional change, not even the TIE that is wrongly announced when the very last spot on the board is yet to be filled by Black. Even without this off-by-one error, it could be that filling the very last spot completes a frame, so that code has been wrong all the time. In practical terms, this situation only arises when the human player is unconcentrated or the computer player has a bad strategy. The latter may well be, as the computer moves in the (boring) endgame are not directed towards winning -- they fill irrelevant spots before relevant ones. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/games/gomoku/bdinit.c cvs rdiff -u -r1.46 -r1.47 src/games/gomoku/bdisp.c cvs rdiff -u -r1.39 -r1.40 src/games/gomoku/gomoku.h cvs rdiff -u -r1.58 -r1.59 src/games/gomoku/main.c cvs rdiff -u -r1.20 -r1.21 src/games/gomoku/makemove.c cvs rdiff -u -r1.44 -r1.45 src/games/gomoku/pickmove.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/gomoku
Module Name:src
Committed By: rillig
Date: Fri May 27 19:59:56 UTC 2022
Modified Files:
src/games/gomoku: bdinit.c bdisp.c gomoku.h main.c makemove.c
pickmove.c
Log Message:
gomoku: replace 1-based movenum with 0-based nmoves
No functional change, not even the TIE that is wrongly announced when
the very last spot on the board is yet to be filled by Black. Even
without this off-by-one error, it could be that filling the very last
spot completes a frame, so that code has been wrong all the time.
In practical terms, this situation only arises when the human player is
unconcentrated or the computer player has a bad strategy. The latter
may well be, as the computer moves in the (boring) endgame are not
directed towards winning -- they fill irrelevant spots before relevant
ones.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/games/gomoku/bdinit.c
cvs rdiff -u -r1.46 -r1.47 src/games/gomoku/bdisp.c
cvs rdiff -u -r1.39 -r1.40 src/games/gomoku/gomoku.h
cvs rdiff -u -r1.58 -r1.59 src/games/gomoku/main.c
cvs rdiff -u -r1.20 -r1.21 src/games/gomoku/makemove.c
cvs rdiff -u -r1.44 -r1.45 src/games/gomoku/pickmove.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/gomoku/bdinit.c
diff -u src/games/gomoku/bdinit.c:1.21 src/games/gomoku/bdinit.c:1.22
--- src/games/gomoku/bdinit.c:1.21 Sat May 21 16:39:14 2022
+++ src/games/gomoku/bdinit.c Fri May 27 19:59:56 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bdinit.c,v 1.21 2022/05/21 16:39:14 rillig Exp $ */
+/* $NetBSD: bdinit.c,v 1.22 2022/05/27 19:59:56 rillig Exp $ */
/*
* Copyright (c) 1994
@@ -34,7 +34,7 @@
#include
/* from: @(#)bdinit.c 8.2 (Berkeley) 5/3/95 */
-__RCSID("$NetBSD: bdinit.c,v 1.21 2022/05/21 16:39:14 rillig Exp $");
+__RCSID("$NetBSD: bdinit.c,v 1.22 2022/05/27 19:59:56 rillig Exp $");
#include
#include "gomoku.h"
@@ -47,7 +47,7 @@ bdinit(struct spotstr *bp)
struct spotstr *sp;
struct combostr *cbp;
- movenum = 1;
+ nmoves = 0;
/* mark the borders as such */
sp = bp;
Index: src/games/gomoku/bdisp.c
diff -u src/games/gomoku/bdisp.c:1.46 src/games/gomoku/bdisp.c:1.47
--- src/games/gomoku/bdisp.c:1.46 Sun May 22 13:38:08 2022
+++ src/games/gomoku/bdisp.c Fri May 27 19:59:56 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bdisp.c,v 1.46 2022/05/22 13:38:08 rillig Exp $ */
+/* $NetBSD: bdisp.c,v 1.47 2022/05/27 19:59:56 rillig Exp $ */
/*
* Copyright (c) 1994
@@ -34,7 +34,7 @@
#include
/* @(#)bdisp.c 8.2 (Berkeley) 5/3/95 */
-__RCSID("$NetBSD: bdisp.c,v 1.46 2022/05/22 13:38:08 rillig Exp $");
+__RCSID("$NetBSD: bdisp.c,v 1.47 2022/05/27 19:59:56 rillig Exp $");
#include
#include
@@ -171,7 +171,7 @@ bdisp(void)
c = pcolor[sp->s_occ];
move(scr_y(j), scr_x(i));
- if (movenum > 1 && movelog[movenum - 2] == PT(i, j)) {
+ if (nmoves > 0 && movelog[nmoves - 1] == PT(i, j)) {
attron(A_BOLD);
addch(c);
attroff(A_BOLD);
Index: src/games/gomoku/gomoku.h
diff -u src/games/gomoku/gomoku.h:1.39 src/games/gomoku/gomoku.h:1.40
--- src/games/gomoku/gomoku.h:1.39 Sun May 22 10:45:02 2022
+++ src/games/gomoku/gomoku.h Fri May 27 19:59:56 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: gomoku.h,v 1.39 2022/05/22 10:45:02 rillig Exp $ */
+/* $NetBSD: gomoku.h,v 1.40 2022/05/27 19:59:56 rillig Exp $ */
/*
* Copyright (c) 1994
@@ -229,8 +229,8 @@ extern struct combostr frames[FAREA]; /
extern struct combostr *sortframes[2]; /* sorted, non-empty frames */
extern u_char overlap[FAREA * FAREA]; /* frame [a][b] overlap */
extern short intersect[FAREA * FAREA]; /* frame [a][b] intersection */
-extern int movelog[BSZ * BSZ]; /* history of moves */
-extern int movenum;
+extern int movelog[BSZ * BSZ];
+extern unsigned int nmoves;
extern int debug;
extern bool interactive;
Index: src/games/gomoku/main.c
diff -u src/games/gomoku/main.c:1.58 src/games/gomoku/main.c:1.59
--- src/games/gomoku/main.c:1.58 Sun May 22 09:17:15 2022
+++ src/games/gomoku/main.c Fri May 27 19:59:56 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.58 2022/05/22 09:17:15 rillig Exp $ */
+/* $NetBSD: main.c,v 1.59 2022/05/27 19:59:56 rillig Exp $ */
/*
* Copyright (c) 1994
@@ -36,7 +36,7 @@
__COPYRIGHT("@(#) Copyright (c) 1994\
The Regents of the University of California. All rights reserved.");
/* @(#)main.c 8.4 (Berkeley) 5/4/95 */
-__RCSID("$NetBSD: main.c,v 1.58 2022/05/22 09:17:15 rillig Exp $");
+__RCSID("$NetBSD: main.c,v 1.59 2022/05/27 19:59:56 rillig Exp $");
#include
#include
@@ -78,8 +78,8 @@ struct combostr frames[FAREA]; /* stora
struct combostr *sortframes[2]; /* sorted list of non-empty frames */
u_char overlap[FAREA * FAREA]; /* true if frame [a][b] overlap */
short intersect[FAREA * FAREA]; /* frame [a][b] intersection */
-int movelog[BSZ * BSZ]; /* log of all the moves */
-int movenum; /* current move number */
+int movelog[BSZ * BSZ]; /* log of all played moves */
CVS commit: src/games/gomoku
Module Name:src Committed By: rillig Date: Fri May 27 19:30:56 UTC 2022 Modified Files: src/games/gomoku: pickmove.c Log Message: gomoku: split local variable into separate variables No binary change. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/games/gomoku/pickmove.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/gomoku
Module Name:src
Committed By: rillig
Date: Fri May 27 19:30:56 UTC 2022
Modified Files:
src/games/gomoku: pickmove.c
Log Message:
gomoku: split local variable into separate variables
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/games/gomoku/pickmove.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/gomoku/pickmove.c
diff -u src/games/gomoku/pickmove.c:1.43 src/games/gomoku/pickmove.c:1.44
--- src/games/gomoku/pickmove.c:1.43 Sun May 22 10:45:02 2022
+++ src/games/gomoku/pickmove.c Fri May 27 19:30:56 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pickmove.c,v 1.43 2022/05/22 10:45:02 rillig Exp $ */
+/* $NetBSD: pickmove.c,v 1.44 2022/05/27 19:30:56 rillig Exp $ */
/*
* Copyright (c) 1994
@@ -34,7 +34,7 @@
#include
/* @(#)pickmove.c 8.2 (Berkeley) 5/3/95 */
-__RCSID("$NetBSD: pickmove.c,v 1.43 2022/05/22 10:45:02 rillig Exp $");
+__RCSID("$NetBSD: pickmove.c,v 1.44 2022/05/27 19:30:56 rillig Exp $");
#include
#include
@@ -232,7 +232,7 @@ scanframes(int color)
struct spotstr *sp;
union comboval *cp;
struct elist *nep;
- int i, r, d, n;
+ int i, r, n;
union comboval cb;
curcolor = color;
@@ -249,10 +249,10 @@ scanframes(int color)
* winning moves J12 and J7.
*/
sp = [cbp->c_vertex];
- cb.s = sp->s_fval[color][d = cbp->c_dir].s;
+ cb.s = sp->s_fval[color][cbp->c_dir].s;
if (cb.s < 0x101) {
- d = dd[d];
- for (i = 5 + cb.cv_win; --i >= 0; sp += d) {
+ int delta = dd[cbp->c_dir];
+ for (i = 5 + cb.cv_win; --i >= 0; sp += delta) {
if (sp->s_occ != EMPTY)
continue;
sp->s_combo[color].s = cb.s;
@@ -271,7 +271,7 @@ scanframes(int color)
do {
sp = [cbp->c_vertex];
cp = >s_fval[color][r = cbp->c_dir];
- d = dd[r];
+ int delta = dd[r];
if (cp->cv_win != 0) {
/*
* Since this is the first spot of an open-ended
@@ -292,13 +292,13 @@ scanframes(int color)
cb.s = cp->s;
else if (color != nextcolor)
memset(tmpmap, 0, sizeof(tmpmap));
- sp += d;
+ sp += delta;
i = 1;
} else {
cb.s = cp->s;
i = 0;
}
- for (; i < 5; i++, sp += d) { /* for each spot */
+ for (; i < 5; i++, sp += delta) { /* for each spot */
if (sp->s_occ != EMPTY)
continue;
if (cp->s < sp->s_combo[color].s) {
@@ -334,19 +334,18 @@ scanframes(int color)
* Try to make new 3rd level combos, 4th level, etc.
* Limit the search depth early in the game.
*/
- d = 2;
/* LINTED 117: bitwise '>>' on signed value possibly nonportable */
- while (d <= ((movenum + 1) >> 1) && combolen > n) {
- if (d >= 9)
+ for (int level = 2;
+ level <= ((movenum + 1) >> 1) && combolen > n; level++) {
+ if (level >= 9)
break; /* Do not think too long. */
if (debug != 0) {
debuglog("%cL%d %d %d %d", "BW"[color],
- d, combolen - n, combocnt, elistcnt);
+ level, combolen - n, combocnt, elistcnt);
refresh();
}
n = combolen;
- addframes(d);
- d++;
+ addframes(level);
}
/* scan for combos at empty spots */
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: nia Date: Fri May 27 19:05:29 UTC 2022 Modified Files: xsrc/external/mit/xdm/dist/config: Xsession.in xsrc/external/mit/xinit/dist: xinitrc.cpp Log Message: Only set dpi when necessary to avoid divide by zero on very small screens To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xdm/dist/config/Xsession.in cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xinit/dist/xinitrc.cpp 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/xdm/dist/config/Xsession.in diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.16 xsrc/external/mit/xdm/dist/config/Xsession.in:1.17 --- xsrc/external/mit/xdm/dist/config/Xsession.in:1.16 Fri May 27 17:58:54 2022 +++ xsrc/external/mit/xdm/dist/config/Xsession.in Fri May 27 19:05:28 2022 @@ -1,6 +1,6 @@ XCOMM!SHELL_CMD XCOMM -XHASH $NetBSD: Xsession.in,v 1.16 2022/05/27 17:58:54 nia Exp $ +XHASH $NetBSD: Xsession.in,v 1.17 2022/05/27 19:05:28 nia Exp $ XCOMM redirect errors to a file in user's home directory if we can @@ -75,7 +75,6 @@ else #ifdef COLOR *customization: -color #endif -Xft.dpi: $(/usr/bin/printf '96 * (%d / 16)\n' "$fontsize" | /usr/bin/bc /dev/stdin) *VT100.foreground: grey90 *VT100.background: black Bitmap*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* @@ -95,6 +94,7 @@ Xmh*font: -*-spleen-medium-r-*-*-$ EOF if [ $fontsize -gt 18 ]; then BINDIR/xrdb -merge - <
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: nia Date: Fri May 27 19:05:29 UTC 2022 Modified Files: xsrc/external/mit/xdm/dist/config: Xsession.in xsrc/external/mit/xinit/dist: xinitrc.cpp Log Message: Only set dpi when necessary to avoid divide by zero on very small screens To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xdm/dist/config/Xsession.in cvs rdiff -u -r1.18 -r1.19 xsrc/external/mit/xinit/dist/xinitrc.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: bouyer Date: Fri May 27 18:35:38 UTC 2022 Modified Files: src/sys/arch/xen/xen: xenevt.c Log Message: xenevt_setipending(): also increase xenevt_ih->ih_pending, so that the handler will be called when the IPL is lowered. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/xen/xen/xenevt.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/xen/xen/xenevt.c diff -u src/sys/arch/xen/xen/xenevt.c:1.64 src/sys/arch/xen/xen/xenevt.c:1.65 --- src/sys/arch/xen/xen/xenevt.c:1.64 Sat Jul 24 21:31:36 2021 +++ src/sys/arch/xen/xen/xenevt.c Fri May 27 18:35:38 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: xenevt.c,v 1.64 2021/07/24 21:31:36 andvar Exp $ */ +/* $NetBSD: xenevt.c,v 1.65 2022/05/27 18:35:38 bouyer Exp $ */ /* * Copyright (c) 2005 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.64 2021/07/24 21:31:36 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.65 2022/05/27 18:35:38 bouyer Exp $"); #include "opt_xen.h" #include @@ -211,6 +211,7 @@ xenevt_setipending(int l1, int l2) atomic_or_ulong(_ev1, 1UL << l1); atomic_or_ulong(_ev2[l1], 1UL << l2); atomic_or_32(_ih->ih_cpu->ci_ipending, 1 << SIR_XENIPL_HIGH); + atomic_add_int(_ih->ih_pending, 1); evtsource[xenevt_ev]->ev_evcnt.ev_count++; }
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: bouyer Date: Fri May 27 18:35:38 UTC 2022 Modified Files: src/sys/arch/xen/xen: xenevt.c Log Message: xenevt_setipending(): also increase xenevt_ih->ih_pending, so that the handler will be called when the IPL is lowered. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/arch/xen/xen/xenevt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: xsrc/external/mit/xcursor-themes/dist
Module Name:xsrc Committed By: nia Date: Fri May 27 18:07:13 UTC 2022 Update of /cvsroot/xsrc/external/mit/xcursor-themes/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22121 Log Message: Import xcursor-themes-1.0.6 Status: Vendor Tag: XORG Release Tags: xcursor-themes-1-0-6 N xsrc/external/mit/xcursor-themes/dist/missing N xsrc/external/mit/xcursor-themes/dist/config.sub N xsrc/external/mit/xcursor-themes/dist/COPYING N xsrc/external/mit/xcursor-themes/dist/genmakefile.sh N xsrc/external/mit/xcursor-themes/dist/compile N xsrc/external/mit/xcursor-themes/dist/config.guess N xsrc/external/mit/xcursor-themes/dist/configure.ac N xsrc/external/mit/xcursor-themes/dist/install-sh N xsrc/external/mit/xcursor-themes/dist/aclocal.m4 N xsrc/external/mit/xcursor-themes/dist/Makefile.in N xsrc/external/mit/xcursor-themes/dist/Makefile.am N xsrc/external/mit/xcursor-themes/dist/ChangeLog N xsrc/external/mit/xcursor-themes/dist/README.md N xsrc/external/mit/xcursor-themes/dist/INSTALL N xsrc/external/mit/xcursor-themes/dist/configure N xsrc/external/mit/xcursor-themes/dist/handhelds/gumby.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/left_tee.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/center_ptr.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/left_ptr.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/top_right_corner.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/circle.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/dot.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/shuttle.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/right_side.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/cross.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/left_side.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/based_arrow_up.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/double_arrow.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/watch.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/hand2.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/dotbox.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/top_side.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/bottom_side.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/fleur.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/sb_right_arrow.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/Makefile.am N xsrc/external/mit/xcursor-themes/dist/handhelds/Makefile.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/sb_up_arrow.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/bottom_right_corner.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/bottom_tee.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/ll_angle.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/sb_h_double_arrow.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/sb_v_double_arrow.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/top_tee.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/left_ptr_watch.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/pencil.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/X_cursor.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/right_ptr.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/based_arrow_down.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/Makefile.in N xsrc/external/mit/xcursor-themes/dist/handhelds/draped_box.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/right_tee.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/xterm.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/Makefile.cursors N xsrc/external/mit/xcursor-themes/dist/handhelds/bottom_left_corner.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/top_left_corner.cfg N xsrc/external/mit/xcursor-themes/dist/redglass/xterm-64.png N xsrc/external/mit/xcursor-themes/dist/redglass/based_arrow_down-32.png N xsrc/external/mit/xcursor-themes/dist/redglass/dotbox-24.png N xsrc/external/mit/xcursor-themes/dist/redglass/pencil.cfg N xsrc/external/mit/xcursor-themes/dist/redglass/circle-64.png N xsrc/external/mit/xcursor-themes/dist/redglass/left_tee-16.png N xsrc/external/mit/xcursor-themes/dist/redglass/sb_h_double_arrow-16.png N xsrc/external/mit/xcursor-themes/dist/redglass/X_cursor-48.png N xsrc/external/mit/xcursor-themes/dist/redglass/circle-16.png N xsrc/external/mit/xcursor-themes/dist/redglass/fleur-48.png N xsrc/external/mit/xcursor-themes/dist/redglass/top_right_corner-48.png N xsrc/external/mit/xcursor-themes/dist/redglass/left_tee-64.png N xsrc/external/mit/xcursor-themes/dist/redglass/sb_h_double_arrow-64.png N xsrc/external/mit/xcursor-themes/dist/redglass/hourglass-90-24.png N xsrc/external/mit/xcursor-themes/dist/redglass/fleur.xcf N xsrc/external/mit/xcursor-themes/dist/redglass/cross-48.png N xsrc/external/mit/xcursor-themes/dist/redglass/top_tee.xcf N xsrc/external/mit/xcursor-themes/dist/redglass/sb_right_arrow-24.png N xsrc/external/mit/xcursor-themes/dist/redglass/dot.cfg N
CVS import: xsrc/external/mit/xcursor-themes/dist
Module Name:xsrc Committed By: nia Date: Fri May 27 18:07:13 UTC 2022 Update of /cvsroot/xsrc/external/mit/xcursor-themes/dist In directory ivanova.netbsd.org:/tmp/cvs-serv22121 Log Message: Import xcursor-themes-1.0.6 Status: Vendor Tag: XORG Release Tags: xcursor-themes-1-0-6 N xsrc/external/mit/xcursor-themes/dist/missing N xsrc/external/mit/xcursor-themes/dist/config.sub N xsrc/external/mit/xcursor-themes/dist/COPYING N xsrc/external/mit/xcursor-themes/dist/genmakefile.sh N xsrc/external/mit/xcursor-themes/dist/compile N xsrc/external/mit/xcursor-themes/dist/config.guess N xsrc/external/mit/xcursor-themes/dist/configure.ac N xsrc/external/mit/xcursor-themes/dist/install-sh N xsrc/external/mit/xcursor-themes/dist/aclocal.m4 N xsrc/external/mit/xcursor-themes/dist/Makefile.in N xsrc/external/mit/xcursor-themes/dist/Makefile.am N xsrc/external/mit/xcursor-themes/dist/ChangeLog N xsrc/external/mit/xcursor-themes/dist/README.md N xsrc/external/mit/xcursor-themes/dist/INSTALL N xsrc/external/mit/xcursor-themes/dist/configure N xsrc/external/mit/xcursor-themes/dist/handhelds/gumby.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/left_tee.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/center_ptr.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/left_ptr.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/top_right_corner.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/circle.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/dot.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/shuttle.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/right_side.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/cross.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/left_side.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/based_arrow_up.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/double_arrow.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/watch.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/hand2.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/dotbox.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/top_side.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/bottom_side.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/fleur.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/sb_right_arrow.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/Makefile.am N xsrc/external/mit/xcursor-themes/dist/handhelds/Makefile.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/sb_up_arrow.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/bottom_right_corner.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/bottom_tee.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/ll_angle.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/sb_h_double_arrow.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/sb_v_double_arrow.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/top_tee.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/left_ptr_watch.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/pencil.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/X_cursor.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/right_ptr.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/based_arrow_down.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/Makefile.in N xsrc/external/mit/xcursor-themes/dist/handhelds/draped_box.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/right_tee.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/xterm.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/Makefile.cursors N xsrc/external/mit/xcursor-themes/dist/handhelds/bottom_left_corner.cfg N xsrc/external/mit/xcursor-themes/dist/handhelds/top_left_corner.cfg N xsrc/external/mit/xcursor-themes/dist/redglass/xterm-64.png N xsrc/external/mit/xcursor-themes/dist/redglass/based_arrow_down-32.png N xsrc/external/mit/xcursor-themes/dist/redglass/dotbox-24.png N xsrc/external/mit/xcursor-themes/dist/redglass/pencil.cfg N xsrc/external/mit/xcursor-themes/dist/redglass/circle-64.png N xsrc/external/mit/xcursor-themes/dist/redglass/left_tee-16.png N xsrc/external/mit/xcursor-themes/dist/redglass/sb_h_double_arrow-16.png N xsrc/external/mit/xcursor-themes/dist/redglass/X_cursor-48.png N xsrc/external/mit/xcursor-themes/dist/redglass/circle-16.png N xsrc/external/mit/xcursor-themes/dist/redglass/fleur-48.png N xsrc/external/mit/xcursor-themes/dist/redglass/top_right_corner-48.png N xsrc/external/mit/xcursor-themes/dist/redglass/left_tee-64.png N xsrc/external/mit/xcursor-themes/dist/redglass/sb_h_double_arrow-64.png N xsrc/external/mit/xcursor-themes/dist/redglass/hourglass-90-24.png N xsrc/external/mit/xcursor-themes/dist/redglass/fleur.xcf N xsrc/external/mit/xcursor-themes/dist/redglass/cross-48.png N xsrc/external/mit/xcursor-themes/dist/redglass/top_tee.xcf N xsrc/external/mit/xcursor-themes/dist/redglass/sb_right_arrow-24.png N xsrc/external/mit/xcursor-themes/dist/redglass/dot.cfg N
CVS import: external/mit/xcursor-themes/dist
Module Name:external Committed By: nia Date: Fri May 27 18:06:08 UTC 2022 Update of /cvsroot/external/mit/xcursor-themes/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28450 Log Message: Import xcursor-themes-1.0.6 Status: Vendor Tag: XORG Release Tags: xcursor-themes-1-0-6 N external/mit/xcursor-themes/dist/missing N external/mit/xcursor-themes/dist/config.sub N external/mit/xcursor-themes/dist/COPYING N external/mit/xcursor-themes/dist/genmakefile.sh N external/mit/xcursor-themes/dist/compile N external/mit/xcursor-themes/dist/config.guess N external/mit/xcursor-themes/dist/configure.ac N external/mit/xcursor-themes/dist/install-sh N external/mit/xcursor-themes/dist/aclocal.m4 N external/mit/xcursor-themes/dist/Makefile.in N external/mit/xcursor-themes/dist/Makefile.am N external/mit/xcursor-themes/dist/ChangeLog N external/mit/xcursor-themes/dist/README.md N external/mit/xcursor-themes/dist/INSTALL N external/mit/xcursor-themes/dist/configure N external/mit/xcursor-themes/dist/handhelds/gumby.cfg N external/mit/xcursor-themes/dist/handhelds/left_tee.cfg N external/mit/xcursor-themes/dist/handhelds/center_ptr.cfg N external/mit/xcursor-themes/dist/handhelds/left_ptr.cfg N external/mit/xcursor-themes/dist/handhelds/top_right_corner.cfg N external/mit/xcursor-themes/dist/handhelds/circle.cfg N external/mit/xcursor-themes/dist/handhelds/dot.cfg N external/mit/xcursor-themes/dist/handhelds/shuttle.cfg N external/mit/xcursor-themes/dist/handhelds/right_side.cfg N external/mit/xcursor-themes/dist/handhelds/cross.cfg N external/mit/xcursor-themes/dist/handhelds/left_side.cfg N external/mit/xcursor-themes/dist/handhelds/based_arrow_up.cfg N external/mit/xcursor-themes/dist/handhelds/double_arrow.cfg N external/mit/xcursor-themes/dist/handhelds/watch.cfg N external/mit/xcursor-themes/dist/handhelds/hand2.cfg N external/mit/xcursor-themes/dist/handhelds/dotbox.cfg N external/mit/xcursor-themes/dist/handhelds/top_side.cfg N external/mit/xcursor-themes/dist/handhelds/bottom_side.cfg N external/mit/xcursor-themes/dist/handhelds/fleur.cfg N external/mit/xcursor-themes/dist/handhelds/sb_right_arrow.cfg N external/mit/xcursor-themes/dist/handhelds/Makefile.am N external/mit/xcursor-themes/dist/handhelds/Makefile.cfg N external/mit/xcursor-themes/dist/handhelds/sb_up_arrow.cfg N external/mit/xcursor-themes/dist/handhelds/bottom_right_corner.cfg N external/mit/xcursor-themes/dist/handhelds/bottom_tee.cfg N external/mit/xcursor-themes/dist/handhelds/ll_angle.cfg N external/mit/xcursor-themes/dist/handhelds/sb_h_double_arrow.cfg N external/mit/xcursor-themes/dist/handhelds/sb_v_double_arrow.cfg N external/mit/xcursor-themes/dist/handhelds/top_tee.cfg N external/mit/xcursor-themes/dist/handhelds/left_ptr_watch.cfg N external/mit/xcursor-themes/dist/handhelds/pencil.cfg N external/mit/xcursor-themes/dist/handhelds/X_cursor.cfg N external/mit/xcursor-themes/dist/handhelds/right_ptr.cfg N external/mit/xcursor-themes/dist/handhelds/based_arrow_down.cfg N external/mit/xcursor-themes/dist/handhelds/Makefile.in N external/mit/xcursor-themes/dist/handhelds/draped_box.cfg N external/mit/xcursor-themes/dist/handhelds/right_tee.cfg N external/mit/xcursor-themes/dist/handhelds/xterm.cfg N external/mit/xcursor-themes/dist/handhelds/Makefile.cursors N external/mit/xcursor-themes/dist/handhelds/bottom_left_corner.cfg N external/mit/xcursor-themes/dist/handhelds/top_left_corner.cfg N external/mit/xcursor-themes/dist/redglass/xterm-64.png N external/mit/xcursor-themes/dist/redglass/based_arrow_down-32.png N external/mit/xcursor-themes/dist/redglass/dotbox-24.png N external/mit/xcursor-themes/dist/redglass/pencil.cfg N external/mit/xcursor-themes/dist/redglass/circle-64.png N external/mit/xcursor-themes/dist/redglass/left_tee-16.png N external/mit/xcursor-themes/dist/redglass/sb_h_double_arrow-16.png N external/mit/xcursor-themes/dist/redglass/X_cursor-48.png N external/mit/xcursor-themes/dist/redglass/circle-16.png N external/mit/xcursor-themes/dist/redglass/fleur-48.png N external/mit/xcursor-themes/dist/redglass/top_right_corner-48.png N external/mit/xcursor-themes/dist/redglass/left_tee-64.png N external/mit/xcursor-themes/dist/redglass/sb_h_double_arrow-64.png N external/mit/xcursor-themes/dist/redglass/hourglass-90-24.png N external/mit/xcursor-themes/dist/redglass/fleur.xcf N external/mit/xcursor-themes/dist/redglass/cross-48.png N external/mit/xcursor-themes/dist/redglass/top_tee.xcf N external/mit/xcursor-themes/dist/redglass/sb_right_arrow-24.png N external/mit/xcursor-themes/dist/redglass/dot.cfg N external/mit/xcursor-themes/dist/redglass/hourglass-25-32.png N external/mit/xcursor-themes/dist/redglass/top_side-32.png N external/mit/xcursor-themes/dist/redglass/right_tee.cfg N external/mit/xcursor-themes/dist/redglass/hourglass-50-24.png N external/mit/xcursor-themes/dist/redglass/xterm-16.png N external/mit/xcursor-themes/dist/redglass/hourglass-90-16.png N
CVS import: external/mit/xcursor-themes/dist
Module Name:external Committed By: nia Date: Fri May 27 18:06:08 UTC 2022 Update of /cvsroot/external/mit/xcursor-themes/dist In directory ivanova.netbsd.org:/tmp/cvs-serv28450 Log Message: Import xcursor-themes-1.0.6 Status: Vendor Tag: XORG Release Tags: xcursor-themes-1-0-6 N external/mit/xcursor-themes/dist/missing N external/mit/xcursor-themes/dist/config.sub N external/mit/xcursor-themes/dist/COPYING N external/mit/xcursor-themes/dist/genmakefile.sh N external/mit/xcursor-themes/dist/compile N external/mit/xcursor-themes/dist/config.guess N external/mit/xcursor-themes/dist/configure.ac N external/mit/xcursor-themes/dist/install-sh N external/mit/xcursor-themes/dist/aclocal.m4 N external/mit/xcursor-themes/dist/Makefile.in N external/mit/xcursor-themes/dist/Makefile.am N external/mit/xcursor-themes/dist/ChangeLog N external/mit/xcursor-themes/dist/README.md N external/mit/xcursor-themes/dist/INSTALL N external/mit/xcursor-themes/dist/configure N external/mit/xcursor-themes/dist/handhelds/gumby.cfg N external/mit/xcursor-themes/dist/handhelds/left_tee.cfg N external/mit/xcursor-themes/dist/handhelds/center_ptr.cfg N external/mit/xcursor-themes/dist/handhelds/left_ptr.cfg N external/mit/xcursor-themes/dist/handhelds/top_right_corner.cfg N external/mit/xcursor-themes/dist/handhelds/circle.cfg N external/mit/xcursor-themes/dist/handhelds/dot.cfg N external/mit/xcursor-themes/dist/handhelds/shuttle.cfg N external/mit/xcursor-themes/dist/handhelds/right_side.cfg N external/mit/xcursor-themes/dist/handhelds/cross.cfg N external/mit/xcursor-themes/dist/handhelds/left_side.cfg N external/mit/xcursor-themes/dist/handhelds/based_arrow_up.cfg N external/mit/xcursor-themes/dist/handhelds/double_arrow.cfg N external/mit/xcursor-themes/dist/handhelds/watch.cfg N external/mit/xcursor-themes/dist/handhelds/hand2.cfg N external/mit/xcursor-themes/dist/handhelds/dotbox.cfg N external/mit/xcursor-themes/dist/handhelds/top_side.cfg N external/mit/xcursor-themes/dist/handhelds/bottom_side.cfg N external/mit/xcursor-themes/dist/handhelds/fleur.cfg N external/mit/xcursor-themes/dist/handhelds/sb_right_arrow.cfg N external/mit/xcursor-themes/dist/handhelds/Makefile.am N external/mit/xcursor-themes/dist/handhelds/Makefile.cfg N external/mit/xcursor-themes/dist/handhelds/sb_up_arrow.cfg N external/mit/xcursor-themes/dist/handhelds/bottom_right_corner.cfg N external/mit/xcursor-themes/dist/handhelds/bottom_tee.cfg N external/mit/xcursor-themes/dist/handhelds/ll_angle.cfg N external/mit/xcursor-themes/dist/handhelds/sb_h_double_arrow.cfg N external/mit/xcursor-themes/dist/handhelds/sb_v_double_arrow.cfg N external/mit/xcursor-themes/dist/handhelds/top_tee.cfg N external/mit/xcursor-themes/dist/handhelds/left_ptr_watch.cfg N external/mit/xcursor-themes/dist/handhelds/pencil.cfg N external/mit/xcursor-themes/dist/handhelds/X_cursor.cfg N external/mit/xcursor-themes/dist/handhelds/right_ptr.cfg N external/mit/xcursor-themes/dist/handhelds/based_arrow_down.cfg N external/mit/xcursor-themes/dist/handhelds/Makefile.in N external/mit/xcursor-themes/dist/handhelds/draped_box.cfg N external/mit/xcursor-themes/dist/handhelds/right_tee.cfg N external/mit/xcursor-themes/dist/handhelds/xterm.cfg N external/mit/xcursor-themes/dist/handhelds/Makefile.cursors N external/mit/xcursor-themes/dist/handhelds/bottom_left_corner.cfg N external/mit/xcursor-themes/dist/handhelds/top_left_corner.cfg N external/mit/xcursor-themes/dist/redglass/xterm-64.png N external/mit/xcursor-themes/dist/redglass/based_arrow_down-32.png N external/mit/xcursor-themes/dist/redglass/dotbox-24.png N external/mit/xcursor-themes/dist/redglass/pencil.cfg N external/mit/xcursor-themes/dist/redglass/circle-64.png N external/mit/xcursor-themes/dist/redglass/left_tee-16.png N external/mit/xcursor-themes/dist/redglass/sb_h_double_arrow-16.png N external/mit/xcursor-themes/dist/redglass/X_cursor-48.png N external/mit/xcursor-themes/dist/redglass/circle-16.png N external/mit/xcursor-themes/dist/redglass/fleur-48.png N external/mit/xcursor-themes/dist/redglass/top_right_corner-48.png N external/mit/xcursor-themes/dist/redglass/left_tee-64.png N external/mit/xcursor-themes/dist/redglass/sb_h_double_arrow-64.png N external/mit/xcursor-themes/dist/redglass/hourglass-90-24.png N external/mit/xcursor-themes/dist/redglass/fleur.xcf N external/mit/xcursor-themes/dist/redglass/cross-48.png N external/mit/xcursor-themes/dist/redglass/top_tee.xcf N external/mit/xcursor-themes/dist/redglass/sb_right_arrow-24.png N external/mit/xcursor-themes/dist/redglass/dot.cfg N external/mit/xcursor-themes/dist/redglass/hourglass-25-32.png N external/mit/xcursor-themes/dist/redglass/top_side-32.png N external/mit/xcursor-themes/dist/redglass/right_tee.cfg N external/mit/xcursor-themes/dist/redglass/hourglass-50-24.png N external/mit/xcursor-themes/dist/redglass/xterm-16.png N external/mit/xcursor-themes/dist/redglass/hourglass-90-16.png N
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: nia Date: Fri May 27 17:58:54 UTC 2022 Modified Files: xsrc/external/mit/xdm/dist/config: Xsession.in xsrc/external/mit/xinit/dist: xinitrc.cpp Log Message: More DPI magic... allow most modern GTK and Qt apps to automatically scale To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xdm/dist/config/Xsession.in cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xinit/dist/xinitrc.cpp 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/xdm/dist/config/Xsession.in diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.15 xsrc/external/mit/xdm/dist/config/Xsession.in:1.16 --- xsrc/external/mit/xdm/dist/config/Xsession.in:1.15 Fri May 27 14:23:23 2022 +++ xsrc/external/mit/xdm/dist/config/Xsession.in Fri May 27 17:58:54 2022 @@ -1,6 +1,6 @@ XCOMM!SHELL_CMD XCOMM -XHASH $NetBSD: Xsession.in,v 1.15 2022/05/27 14:23:23 nia Exp $ +XHASH $NetBSD: Xsession.in,v 1.16 2022/05/27 17:58:54 nia Exp $ XCOMM redirect errors to a file in user's home directory if we can @@ -75,6 +75,7 @@ else #ifdef COLOR *customization: -color #endif +Xft.dpi: $(/usr/bin/printf '96 * (%d / 16)\n' "$fontsize" | /usr/bin/bc /dev/stdin) *VT100.foreground: grey90 *VT100.background: black Bitmap*font:-*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* Index: xsrc/external/mit/xinit/dist/xinitrc.cpp diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.17 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.18 --- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.17 Fri May 27 14:23:23 2022 +++ xsrc/external/mit/xinit/dist/xinitrc.cpp Fri May 27 17:58:54 2022 @@ -1,5 +1,5 @@ XCOMM!SHELL_CMD -XHASH $NetBSD: xinitrc.cpp,v 1.17 2022/05/27 14:23:23 nia Exp $ +XHASH $NetBSD: xinitrc.cpp,v 1.18 2022/05/27 17:58:54 nia Exp $ userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap @@ -44,6 +44,7 @@ else XHASH ifdef COLOR *customization: -color XHASH endif +Xft.dpi: $(/usr/bin/printf '96 * (%d / 16)\n' "$fontsize" | /usr/bin/bc /dev/stdin) *VT100.foreground: grey90 *VT100.background: black *SimpleMenu*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-*
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: nia Date: Fri May 27 17:58:54 UTC 2022 Modified Files: xsrc/external/mit/xdm/dist/config: Xsession.in xsrc/external/mit/xinit/dist: xinitrc.cpp Log Message: More DPI magic... allow most modern GTK and Qt apps to automatically scale To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 xsrc/external/mit/xdm/dist/config/Xsession.in cvs rdiff -u -r1.17 -r1.18 xsrc/external/mit/xinit/dist/xinitrc.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: xsrc/external/mit
On Fri, May 27, 2022 at 15:22:45 +, nia wrote: > On Fri, May 27, 2022 at 06:10:22PM +0300, Valery Ushakov wrote: > > On Fri, May 27, 2022 at 14:23:23 +, Nia Alarie wrote: > > > > > Module Name: xsrc > > > Committed By: nia > > > Date: Fri May 27 14:23:23 UTC 2022 > > > > > > Modified Files: > > > xsrc/external/mit/xdm/dist/config: Xsession.in > > > xsrc/external/mit/xinit/dist: xinitrc.cpp > > > > > > Log Message: > > > In xterm, use TrueType fonts rather than Spleen at higher DPIs. > > > > >From a quick look - doesn't that also need renderFont set to true? > > > > -uwe > > "If the faceName resource is set, then start by using > the TrueType font rather than the bitmap font." > > Should be fine. Ah, that seems to have been changed in the version we have in -current. The older version said something different there. Sorry for the noise. -uwe
CVS commit: src/external/mit/ctwm/etc
Module Name:src Committed By: nia Date: Fri May 27 17:04:16 UTC 2022 Modified Files: src/external/mit/ctwm/etc: system.ctwmrc Log Message: ctwmrc: Use a slightly more muted orange color. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/external/mit/ctwm/etc/system.ctwmrc 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/ctwm/etc/system.ctwmrc diff -u src/external/mit/ctwm/etc/system.ctwmrc:1.18 src/external/mit/ctwm/etc/system.ctwmrc:1.19 --- src/external/mit/ctwm/etc/system.ctwmrc:1.18 Mon May 16 04:52:11 2022 +++ src/external/mit/ctwm/etc/system.ctwmrc Fri May 27 17:04:16 2022 @@ -1,5 +1,5 @@ # -# $NetBSD: system.ctwmrc,v 1.18 2022/05/16 04:52:11 nia Exp $ +# $NetBSD: system.ctwmrc,v 1.19 2022/05/27 17:04:16 nia Exp $ # # ctwmrc by nia # @@ -225,7 +225,7 @@ Color MenuBackground"lavender" MenuForeground"black" - MenuTitleBackground "darkorange" + MenuTitleBackground "darkorange2" MenuTitleForeground "black" MenuShadowColor "gray15"
CVS commit: src/external/mit/ctwm/etc
Module Name:src Committed By: nia Date: Fri May 27 17:04:16 UTC 2022 Modified Files: src/external/mit/ctwm/etc: system.ctwmrc Log Message: ctwmrc: Use a slightly more muted orange color. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/external/mit/ctwm/etc/system.ctwmrc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/conf
Module Name:src Committed By: tsutsui Date: Fri May 27 16:59:19 UTC 2022 Modified Files: src/sys/arch/luna68k/conf: GENERIC INSTALL Log Message: Specify -fno-unwind-tables to shrink binaries. To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 src/sys/arch/luna68k/conf/GENERIC cvs rdiff -u -r1.32 -r1.33 src/sys/arch/luna68k/conf/INSTALL 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/luna68k/conf/GENERIC diff -u src/sys/arch/luna68k/conf/GENERIC:1.131 src/sys/arch/luna68k/conf/GENERIC:1.132 --- src/sys/arch/luna68k/conf/GENERIC:1.131 Fri Feb 4 18:28:53 2022 +++ src/sys/arch/luna68k/conf/GENERIC Fri May 27 16:59:19 2022 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.131 2022/02/04 18:28:53 tsutsui Exp $ +# $NetBSD: GENERIC,v 1.132 2022/05/27 16:59:19 tsutsui Exp $ # # GENERIC machine description file # @@ -22,9 +22,9 @@ include "arch/luna68k/conf/std.luna68k" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.131 $" +#ident "GENERIC-$Revision: 1.132 $" -makeoptions COPTS="-O2 -fno-reorder-blocks -fno-omit-frame-pointer" +makeoptions COPTS="-O2 -fno-reorder-blocks -fno-unwind-tables -fno-omit-frame-pointer" # See share/mk/sys.mk. -fno-omit-frame-pointer is necessary for # backtraces in DDB. Index: src/sys/arch/luna68k/conf/INSTALL diff -u src/sys/arch/luna68k/conf/INSTALL:1.32 src/sys/arch/luna68k/conf/INSTALL:1.33 --- src/sys/arch/luna68k/conf/INSTALL:1.32 Fri Feb 4 18:28:53 2022 +++ src/sys/arch/luna68k/conf/INSTALL Fri May 27 16:59:19 2022 @@ -1,10 +1,10 @@ -# $NetBSD: INSTALL,v 1.32 2022/02/04 18:28:53 tsutsui Exp $ +# $NetBSD: INSTALL,v 1.33 2022/05/27 16:59:19 tsutsui Exp $ # # config for installation ramdisk kernel # include "arch/luna68k/conf/std.luna68k" -makeoptions COPTS="-Os" # Optimise for space. Implies -O2 +makeoptions COPTS="-Os -fno-unwind-tables" # Optimise for space. maxusers 4
CVS commit: src/sys/arch/luna68k/conf
Module Name:src Committed By: tsutsui Date: Fri May 27 16:59:19 UTC 2022 Modified Files: src/sys/arch/luna68k/conf: GENERIC INSTALL Log Message: Specify -fno-unwind-tables to shrink binaries. To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 src/sys/arch/luna68k/conf/GENERIC cvs rdiff -u -r1.32 -r1.33 src/sys/arch/luna68k/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: xsrc/external/mit
On Fri, May 27, 2022 at 06:10:22PM +0300, Valery Ushakov wrote: > On Fri, May 27, 2022 at 14:23:23 +, Nia Alarie wrote: > > > Module Name:xsrc > > Committed By: nia > > Date: Fri May 27 14:23:23 UTC 2022 > > > > Modified Files: > > xsrc/external/mit/xdm/dist/config: Xsession.in > > xsrc/external/mit/xinit/dist: xinitrc.cpp > > > > Log Message: > > In xterm, use TrueType fonts rather than Spleen at higher DPIs. > > >From a quick look - doesn't that also need renderFont set to true? > > -uwe "If the faceName resource is set, then start by using the TrueType font rather than the bitmap font." Should be fine.
Re: CVS commit: xsrc/external/mit
On Fri, May 27, 2022 at 14:23:23 +, Nia Alarie wrote: > Module Name: xsrc > Committed By: nia > Date: Fri May 27 14:23:23 UTC 2022 > > Modified Files: > xsrc/external/mit/xdm/dist/config: Xsession.in > xsrc/external/mit/xinit/dist: xinitrc.cpp > > Log Message: > In xterm, use TrueType fonts rather than Spleen at higher DPIs. >From a quick look - doesn't that also need renderFont set to true? -uwe
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: nia Date: Fri May 27 14:23:23 UTC 2022 Modified Files: xsrc/external/mit/xdm/dist/config: Xsession.in xsrc/external/mit/xinit/dist: xinitrc.cpp Log Message: In xterm, use TrueType fonts rather than Spleen at higher DPIs. Requested by jmcneill. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xdm/dist/config/Xsession.in cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xinit/dist/xinitrc.cpp 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/xdm/dist/config/Xsession.in diff -u xsrc/external/mit/xdm/dist/config/Xsession.in:1.14 xsrc/external/mit/xdm/dist/config/Xsession.in:1.15 --- xsrc/external/mit/xdm/dist/config/Xsession.in:1.14 Mon May 9 09:00:20 2022 +++ xsrc/external/mit/xdm/dist/config/Xsession.in Fri May 27 14:23:23 2022 @@ -1,6 +1,6 @@ XCOMM!SHELL_CMD XCOMM -XHASH $NetBSD: Xsession.in,v 1.14 2022/05/09 09:00:20 uwe Exp $ +XHASH $NetBSD: Xsession.in,v 1.15 2022/05/27 14:23:23 nia Exp $ XCOMM redirect errors to a file in user's home directory if we can @@ -91,35 +91,10 @@ Xgc*font: -*-spleen-medium-r-*-*-$ Xmag*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* Xmessage*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* Xmh*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* -Xman*font: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* -Xman*manualFontNormal: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* -Xman*manualFontBold: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* -Xman*manualFontItalic: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* -Xman*directoryFontNormal: -*-spleen-medium-r-*-*-$fontsize-*-*-*-*-*-*-* EOF if [ $fontsize -gt 18 ]; then BINDIR/xrdb -merge - <
CVS commit: xsrc/external/mit
Module Name:xsrc Committed By: nia Date: Fri May 27 14:23:23 UTC 2022 Modified Files: xsrc/external/mit/xdm/dist/config: Xsession.in xsrc/external/mit/xinit/dist: xinitrc.cpp Log Message: In xterm, use TrueType fonts rather than Spleen at higher DPIs. Requested by jmcneill. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 xsrc/external/mit/xdm/dist/config/Xsession.in cvs rdiff -u -r1.16 -r1.17 xsrc/external/mit/xinit/dist/xinitrc.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/fs
Module Name:src
Committed By: nia
Date: Fri May 27 09:25:39 UTC 2022
Modified Files:
src/sys/rump/fs: Makefile.rumpfscomp
Log Message:
... and more MKLFS here
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/fs/Makefile.rumpfscomp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/fs/Makefile.rumpfscomp
diff -u src/sys/rump/fs/Makefile.rumpfscomp:1.8 src/sys/rump/fs/Makefile.rumpfscomp:1.9
--- src/sys/rump/fs/Makefile.rumpfscomp:1.8 Fri May 15 23:32:28 2020
+++ src/sys/rump/fs/Makefile.rumpfscomp Fri May 27 09:25:39 2022
@@ -1,12 +1,16 @@
-# $NetBSD: Makefile.rumpfscomp,v 1.8 2020/05/15 23:32:28 christos Exp $
+# $NetBSD: Makefile.rumpfscomp,v 1.9 2022/05/27 09:25:39 nia Exp $
#
.include
-RUMPFSCOMP= cd9660 efs ext2fs fdesc ffs hfs kernfs lfs mfs msdos \
+RUMPFSCOMP= cd9660 efs ext2fs fdesc ffs hfs kernfs mfs msdos \
nfs nilfs ntfs null ptyfs syspuffs sysvbfs \
tmpfs udf umap union v7fs
+.if ${MKLFS} != "no" || make(rumpdescribe)
+RUMPFSCOMP+= lfs
+.endif
+
.if ${MKZFS} != "no" || make(rumpdescribe)
RUMPFSCOMP+= zfs
.endif
CVS commit: src/sys/rump/fs
Module Name:src Committed By: nia Date: Fri May 27 09:25:39 UTC 2022 Modified Files: src/sys/rump/fs: Makefile.rumpfscomp Log Message: ... and more MKLFS here To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/rump/fs/Makefile.rumpfscomp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man5
Module Name:src Committed By: nia Date: Fri May 27 09:25:08 UTC 2022 Modified Files: src/share/man/man5: mk.conf.5 Log Message: Document MKLFS To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/share/man/man5/mk.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man5/mk.conf.5 diff -u src/share/man/man5/mk.conf.5:1.90 src/share/man/man5/mk.conf.5:1.91 --- src/share/man/man5/mk.conf.5:1.90 Thu May 26 14:24:42 2022 +++ src/share/man/man5/mk.conf.5 Fri May 27 09:25:08 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: mk.conf.5,v 1.90 2022/05/26 14:24:42 uwe Exp $ +.\" $NetBSD: mk.conf.5,v 1.91 2022/05/27 09:25:08 nia Exp $ .\" .\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -573,6 +573,17 @@ infrastructure (libraries and support programs) is built and installed. .DFLTy . +.It Sy MKLFS +.YorN +Indicates whether the log-structured file system (LFS) programs +are built and installed, i.e. +.Xr newfs_lfs 8 , +.Xr mount_lfs 8 , +.Xr dumplfs 8 , +etc. +.DFLTy +. +. .It Sy MKLINKLIB .YorN Indicates whether all of the shared library infrastructure is built.
CVS commit: src/share/man/man5
Module Name:src Committed By: nia Date: Fri May 27 09:25:08 UTC 2022 Modified Files: src/share/man/man5: mk.conf.5 Log Message: Document MKLFS To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/share/man/man5/mk.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: nia Date: Fri May 27 07:28:22 UTC 2022 Modified Files: src/distrib/sets/lists/base: mi shl.mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: mi shl.mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/tests: mi src/libexec: Makefile src/sbin: Makefile src/share/mk: bsd.README bsd.own.mk src/tests/fs: Makefile src/tests/fs/vfs: Makefile src/usr.sbin: Makefile src/usr.sbin/puffs: Makefile Log Message: mk: Add a MKLFS flag for excluding the log-structured filesystem userspace tools from the build. To generate a diff of this commit: cvs rdiff -u -r1.1301 -r1.1302 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.935 -r1.936 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2413 -r1.2414 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.380 -r1.381 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.292 -r1.293 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.1742 -r1.1743 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.1207 -r1.1208 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.61 -r1.62 src/libexec/Makefile cvs rdiff -u -r1.136 -r1.137 src/sbin/Makefile cvs rdiff -u -r1.433 -r1.434 src/share/mk/bsd.README cvs rdiff -u -r1.1279 -r1.1280 src/share/mk/bsd.own.mk cvs rdiff -u -r1.23 -r1.24 src/tests/fs/Makefile cvs rdiff -u -r1.28 -r1.29 src/tests/fs/vfs/Makefile cvs rdiff -u -r1.288 -r1.289 src/usr.sbin/Makefile cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/puffs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: nia Date: Fri May 27 07:28:22 UTC 2022 Modified Files: src/distrib/sets/lists/base: mi shl.mi src/distrib/sets/lists/comp: mi src/distrib/sets/lists/debug: mi shl.mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/tests: mi src/libexec: Makefile src/sbin: Makefile src/share/mk: bsd.README bsd.own.mk src/tests/fs: Makefile src/tests/fs/vfs: Makefile src/usr.sbin: Makefile src/usr.sbin/puffs: Makefile Log Message: mk: Add a MKLFS flag for excluding the log-structured filesystem userspace tools from the build. To generate a diff of this commit: cvs rdiff -u -r1.1301 -r1.1302 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.935 -r1.936 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.2413 -r1.2414 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.380 -r1.381 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.292 -r1.293 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.1742 -r1.1743 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.1207 -r1.1208 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.61 -r1.62 src/libexec/Makefile cvs rdiff -u -r1.136 -r1.137 src/sbin/Makefile cvs rdiff -u -r1.433 -r1.434 src/share/mk/bsd.README cvs rdiff -u -r1.1279 -r1.1280 src/share/mk/bsd.own.mk cvs rdiff -u -r1.23 -r1.24 src/tests/fs/Makefile cvs rdiff -u -r1.28 -r1.29 src/tests/fs/vfs/Makefile cvs rdiff -u -r1.288 -r1.289 src/usr.sbin/Makefile cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/puffs/Makefile 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/base/mi diff -u src/distrib/sets/lists/base/mi:1.1301 src/distrib/sets/lists/base/mi:1.1302 --- src/distrib/sets/lists/base/mi:1.1301 Wed May 25 21:25:46 2022 +++ src/distrib/sets/lists/base/mi Fri May 27 07:28:21 2022 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1301 2022/05/25 21:25:46 nia Exp $ +# $NetBSD: mi,v 1.1302 2022/05/27 07:28:21 nia Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -327,7 +327,7 @@ ./libexec/dhcpcd-hooks/30-hostname base-dhcpcd-root ./libexec/dhcpcd-hooks/50-ntp.conf base-dhcpcd-root ./libexec/dhcpcd-run-hooks base-dhcpcd-root -./libexec/lfs_cleanerdbase-sysutil-bin +./libexec/lfs_cleanerdbase-sysutil-bin lfs ./libexec/resolvconfbase-resolvconf-root ./libexec/resolvconf/dnsmasq base-resolvconf-root ./libexec/resolvconf/libc base-resolvconf-root @@ -371,7 +371,7 @@ ./sbin/dmsetup base-lvm-root lvm ./sbin/drvctl base-sysutil-root ./sbin/dump base-sysutil-root -./sbin/dump_lfs base-sysutil-root +./sbin/dump_lfs base-sysutil-root lfs ./sbin/dumpfs base-obsolete obsolete ./sbin/dumplfs base-obsolete obsolete ./sbin/fastboot base-sysutil-root @@ -381,7 +381,7 @@ ./sbin/fsck base-sysutil-root ./sbin/fsck_ext2fsbase-ext2fs-root ./sbin/fsck_ffs base-sysutil-root -./sbin/fsck_lfs base-sysutil-root +./sbin/fsck_lfs base-sysutil-root lfs ./sbin/fsck_msdosbase-sysutil-root ./sbin/fsck_udf base-sysutil-root ./sbin/fsck_v7fsbase-sysutil-root @@ -417,7 +417,7 @@ ./sbin/mount_hfsbase-hfs-root ./sbin/mount_hfspbase-obsolete obsolete ./sbin/mount_kernfsbase-sysutil-root -./sbin/mount_lfsbase-sysutil-root +./sbin/mount_lfsbase-sysutil-root lfs ./sbin/mount_mfsbase-sysutil-root ./sbin/mount_msdosbase-sysutil-root ./sbin/mount_nfsbase-nfsclient-root @@ -443,7 +443,7 @@ ./sbin/newbtconfbase-sysutil-root ./sbin/newfs base-sysutil-root ./sbin/newfs_ext2fsbase-sysutil-root -./sbin/newfs_lfsbase-sysutil-root +./sbin/newfs_lfsbase-sysutil-root lfs ./sbin/newfs_msdosbase-sysutil-root ./sbin/newfs_sysvbfsbase-sysutil-root ./sbin/newfs_udfbase-sysutil-root @@ -466,10 +466,10 @@ ./sbin/raidctl base-sysutil-root ./sbin/rcorder base-sysutil-root ./sbin/rdump base-sysutil-root -./sbin/rdump_lfsbase-sysutil-root +./sbin/rdump_lfsbase-sysutil-root lfs ./sbin/reboot base-sysutil-root ./sbin/resize_ffsbase-sysutil-root -./sbin/resize_lfsbase-sysutil-root +./sbin/resize_lfsbase-sysutil-root lfs ./sbin/resolvconfbase-resolvconf-root ./sbin/restore base-sysutil-root ./sbin/rndctl base-sysutil-root @@ -1477,7 +1477,7 @@ ./usr/sbin/dtracebase-debug-bin dtrace ./usr/sbin/dtrussbase-debug-bin dtrace ./usr/sbin/dumpfsbase-sysutil-bin -./usr/sbin/dumplfsbase-sysutil-bin +./usr/sbin/dumplfsbase-sysutil-bin lfs ./usr/sbin/eaytestbase-obsolete obsolete ./usr/sbin/editmapbase-obsolete obsolete ./usr/sbin/edquotabase-sysutil-bin @@ -1721,7 +1721,7 @@ ./usr/sbin/rump_ext2fsbase-puffs-bin rump ./usr/sbin/rump_ffsbase-puffs-bin rump ./usr/sbin/rump_hfsbase-puffs-bin rump -./usr/sbin/rump_lfs
