CVS commit: src/sys/dev/microcode/aic7xxx

[Rin Okuyama]

Module Name:src
Committed By:   rin
Date:   Mon Jun 29 06:39:38 UTC 2020

Modified Files:
src/sys/dev/microcode/aic7xxx: Makefile

Log Message:
No longer depend on libl.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/microcode/aic7xxx/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/microcode/aic7xxx/Makefile
diff -u src/sys/dev/microcode/aic7xxx/Makefile:1.8 src/sys/dev/microcode/aic7xxx/Makefile:1.9
--- src/sys/dev/microcode/aic7xxx/Makefile:1.8	Sat Jun 27 16:00:34 2020
+++ src/sys/dev/microcode/aic7xxx/Makefile	Mon Jun 29 06:39:38 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2020/06/27 16:00:34 jdolecek Exp $
+#	$NetBSD: Makefile,v 1.9 2020/06/29 06:39:38 rin Exp $
 
 7XXX_SEQ=	aic7xxx.seq
 7XXX_SEQHDR=	aic7xxx_seq.h
@@ -17,7 +17,7 @@ SRCS=	aicasm.c aicasm_symbol.c aicasm_sc
 
 YHEADER=1
 
-DPADD+= ${LIBL} ${LIBY}
+DPADD+= ${LIBY}
 LDADD+= -ly
 
 NOSHARE=# defined

CVS commit: src/sys/dev/microcode/aic7xxx

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Sat Jun 27 16:48:01 UTC 2020

Modified Files:
src/sys/dev/microcode/aic7xxx: aic7xxx_reg.h aic7xxx_seq.h
aicasm_gram.y

Log Message:
make sure to strip leading '$' from NetBSD rcs id so that it won't be
replaces by cvs, and regen the headers again


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/microcode/aic7xxx/aic7xxx_reg.h
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/microcode/aic7xxx/aicasm_gram.y

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/microcode/aic7xxx/aic7xxx_reg.h
diff -u src/sys/dev/microcode/aic7xxx/aic7xxx_reg.h:1.4 src/sys/dev/microcode/aic7xxx/aic7xxx_reg.h:1.5
--- src/sys/dev/microcode/aic7xxx/aic7xxx_reg.h:1.4	Sat Jun 27 16:32:46 2020
+++ src/sys/dev/microcode/aic7xxx/aic7xxx_reg.h	Sat Jun 27 16:48:01 2020
@@ -2,8 +2,8 @@
  * DO NOT EDIT - This file is automatically generated
  *		 from the following source files:
  *
- * $NetBSD: aic7xxx_reg.h,v 1.4 2020/06/27 16:32:46 jdolecek Exp $
- * $NetBSD: aic7xxx_reg.h,v 1.4 2020/06/27 16:32:46 jdolecek Exp $
+ * NetBSD: aic7xxx.seq,v 1.20 2019/06/04 10:15:22 msaitoh Exp $
+ * NetBSD: aic7xxx.reg,v 1.4 2005/12/11 12:22:18 christos Exp $
  */
 typedef int (ahc_reg_print_t)(u_int, u_int *, u_int);
 typedef struct ahc_reg_parse_entry {

Index: src/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
diff -u src/sys/dev/microcode/aic7xxx/aic7xxx_seq.h:1.12 src/sys/dev/microcode/aic7xxx/aic7xxx_seq.h:1.13
--- src/sys/dev/microcode/aic7xxx/aic7xxx_seq.h:1.12	Sat Jun 27 16:29:11 2020
+++ src/sys/dev/microcode/aic7xxx/aic7xxx_seq.h	Sat Jun 27 16:48:01 2020
@@ -2,8 +2,8 @@
  * DO NOT EDIT - This file is automatically generated
  *		 from the following source files:
  *
- * $NetBSD: aic7xxx_seq.h,v 1.12 2020/06/27 16:29:11 jdolecek Exp $
- * $NetBSD: aic7xxx_seq.h,v 1.12 2020/06/27 16:29:11 jdolecek Exp $
+ * NetBSD: aic7xxx.seq,v 1.20 2019/06/04 10:15:22 msaitoh Exp $
+ * NetBSD: aic7xxx.reg,v 1.4 2005/12/11 12:22:18 christos Exp $
  */
 static uint8_t seqprog[] = {
 	0xb2, 0x00, 0x00, 0x08,

Index: src/sys/dev/microcode/aic7xxx/aicasm_gram.y
diff -u src/sys/dev/microcode/aic7xxx/aicasm_gram.y:1.6 src/sys/dev/microcode/aic7xxx/aicasm_gram.y:1.7
--- src/sys/dev/microcode/aic7xxx/aicasm_gram.y:1.6	Sat Nov 25 16:48:32 2006
+++ src/sys/dev/microcode/aic7xxx/aicasm_gram.y	Sat Jun 27 16:48:01 2020
@@ -1,5 +1,5 @@
 %{
-/*	$NetBSD: aicasm_gram.y,v 1.6 2006/11/25 16:48:32 christos Exp $	*/
+/*	$NetBSD: aicasm_gram.y,v 1.7 2020/06/27 16:48:01 jdolecek Exp $	*/
 
 /*
  * Parser for the Aic7xxx SCSI Host adapter sequencer assembler.
@@ -1915,6 +1915,9 @@ add_version(const char *verstring)
 	int newlen;
 	int oldlen;
 
+	if (verstring[0] == '$')
+		verstring++;
+
 	newlen = strlen(verstring) + strlen(prefix);
 	oldlen = 0;
 	if (versions != NULL)

CVS commit: src/sys/dev/microcode/aic7xxx

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Sat Jun 27 16:32:46 UTC 2020

Modified Files:
src/sys/dev/microcode/aic7xxx: aic7xxx_reg.h

Log Message:
regen again


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/microcode/aic7xxx/aic7xxx_reg.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/dev/microcode/aic7xxx/aic7xxx_reg.h
diff -u src/sys/dev/microcode/aic7xxx/aic7xxx_reg.h:1.3 src/sys/dev/microcode/aic7xxx/aic7xxx_reg.h:1.4
--- src/sys/dev/microcode/aic7xxx/aic7xxx_reg.h:1.3	Sat Jun 27 16:29:11 2020
+++ src/sys/dev/microcode/aic7xxx/aic7xxx_reg.h	Sat Jun 27 16:32:46 2020
@@ -2,8 +2,8 @@
  * DO NOT EDIT - This file is automatically generated
  *		 from the following source files:
  *
- * $NetBSD: aic7xxx_reg.h,v 1.3 2020/06/27 16:29:11 jdolecek Exp $
- * $NetBSD: aic7xxx_reg.h,v 1.3 2020/06/27 16:29:11 jdolecek Exp $
+ * $NetBSD: aic7xxx_reg.h,v 1.4 2020/06/27 16:32:46 jdolecek Exp $
+ * $NetBSD: aic7xxx_reg.h,v 1.4 2020/06/27 16:32:46 jdolecek Exp $
  */
 typedef int (ahc_reg_print_t)(u_int, u_int *, u_int);
 typedef struct ahc_reg_parse_entry {

CVS commit: src/sys/dev/microcode/aic7xxx

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Sat Jun 27 16:29:11 UTC 2020

Modified Files:
src/sys/dev/microcode/aic7xxx: aic79xx_reg.h aic7xxx_reg.h
aic7xxx_seq.h

Log Message:
regen - NFCI, confirmed by comparing compiled binary object before and
after


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/microcode/aic7xxx/aic79xx_reg.h \
src/sys/dev/microcode/aic7xxx/aic7xxx_seq.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/microcode/aic7xxx/aic7xxx_reg.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/dev/microcode/aic7xxx/aic79xx_reg.h
diff -u src/sys/dev/microcode/aic7xxx/aic79xx_reg.h:1.11 src/sys/dev/microcode/aic7xxx/aic79xx_reg.h:1.12
--- src/sys/dev/microcode/aic7xxx/aic79xx_reg.h:1.11	Fri Aug 29 03:54:07 2003
+++ src/sys/dev/microcode/aic7xxx/aic79xx_reg.h	Sat Jun 27 16:29:11 2020
@@ -160,13 +160,6 @@ ahd_reg_print_t ahd_dfstatus_print;
 #endif
 
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_arbctl_print;
-#else
-#define ahd_arbctl_print(regvalue, cur_col, wrap) \
-ahd_print_register(NULL, 0, "ARBCTL", 0x1b, regvalue, cur_col, wrap)
-#endif
-
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_sg_cache_shadow_print;
 #else
 #define ahd_sg_cache_shadow_print(regvalue, cur_col, wrap) \
@@ -181,10 +174,10 @@ ahd_reg_print_t ahd_sg_cache_pre_print;
 #endif
 
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_typeptr_print;
+ahd_reg_print_t ahd_arbctl_print;
 #else
-#define ahd_typeptr_print(regvalue, cur_col, wrap) \
-ahd_print_register(NULL, 0, "TYPEPTR", 0x20, regvalue, cur_col, wrap)
+#define ahd_arbctl_print(regvalue, cur_col, wrap) \
+ahd_print_register(NULL, 0, "ARBCTL", 0x1b, regvalue, cur_col, wrap)
 #endif
 
 #if AIC_DEBUG_REGISTERS
@@ -195,6 +188,13 @@ ahd_reg_print_t ahd_lqin_print;
 #endif
 
 #if AIC_DEBUG_REGISTERS
+ahd_reg_print_t ahd_typeptr_print;
+#else
+#define ahd_typeptr_print(regvalue, cur_col, wrap) \
+ahd_print_register(NULL, 0, "TYPEPTR", 0x20, regvalue, cur_col, wrap)
+#endif
+
+#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_tagptr_print;
 #else
 #define ahd_tagptr_print(regvalue, cur_col, wrap) \
@@ -405,13 +405,6 @@ ahd_reg_print_t ahd_scsiseq1_print;
 #endif
 
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_dlcount_print;
-#else
-#define ahd_dlcount_print(regvalue, cur_col, wrap) \
-ahd_print_register(NULL, 0, "DLCOUNT", 0x3c, regvalue, cur_col, wrap)
-#endif
-
-#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_businitid_print;
 #else
 #define ahd_businitid_print(regvalue, cur_col, wrap) \
@@ -426,17 +419,17 @@ ahd_reg_print_t ahd_sxfrctl0_print;
 #endif
 
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_sxfrctl1_print;
+ahd_reg_print_t ahd_dlcount_print;
 #else
-#define ahd_sxfrctl1_print(regvalue, cur_col, wrap) \
-ahd_print_register(NULL, 0, "SXFRCTL1", 0x3d, regvalue, cur_col, wrap)
+#define ahd_dlcount_print(regvalue, cur_col, wrap) \
+ahd_print_register(NULL, 0, "DLCOUNT", 0x3c, regvalue, cur_col, wrap)
 #endif
 
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_sxfrctl2_print;
+ahd_reg_print_t ahd_sxfrctl1_print;
 #else
-#define ahd_sxfrctl2_print(regvalue, cur_col, wrap) \
-ahd_print_register(NULL, 0, "SXFRCTL2", 0x3e, regvalue, cur_col, wrap)
+#define ahd_sxfrctl1_print(regvalue, cur_col, wrap) \
+ahd_print_register(NULL, 0, "SXFRCTL1", 0x3d, regvalue, cur_col, wrap)
 #endif
 
 #if AIC_DEBUG_REGISTERS
@@ -447,17 +440,17 @@ ahd_reg_print_t ahd_bustargid_print;
 #endif
 
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_dffstat_print;
+ahd_reg_print_t ahd_sxfrctl2_print;
 #else
-#define ahd_dffstat_print(regvalue, cur_col, wrap) \
-ahd_print_register(NULL, 0, "DFFSTAT", 0x3f, regvalue, cur_col, wrap)
+#define ahd_sxfrctl2_print(regvalue, cur_col, wrap) \
+ahd_print_register(NULL, 0, "SXFRCTL2", 0x3e, regvalue, cur_col, wrap)
 #endif
 
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_multargid_print;
+ahd_reg_print_t ahd_dffstat_print;
 #else
-#define ahd_multargid_print(regvalue, cur_col, wrap) \
-ahd_print_register(NULL, 0, "MULTARGID", 0x40, regvalue, cur_col, wrap)
+#define ahd_dffstat_print(regvalue, cur_col, wrap) \
+ahd_print_register(NULL, 0, "DFFSTAT", 0x3f, regvalue, cur_col, wrap)
 #endif
 
 #if AIC_DEBUG_REGISTERS
@@ -468,6 +461,13 @@ ahd_reg_print_t ahd_scsisigo_print;
 #endif
 
 #if AIC_DEBUG_REGISTERS
+ahd_reg_print_t ahd_multargid_print;
+#else
+#define ahd_multargid_print(regvalue, cur_col, wrap) \
+ahd_print_register(NULL, 0, "MULTARGID", 0x40, regvalue, cur_col, wrap)
+#endif
+
+#if AIC_DEBUG_REGISTERS
 ahd_reg_print_t ahd_scsisigi_print;
 #else
 #define ahd_scsisigi_print(regvalue, cur_col, wrap) \
@@ -517,17 +517,17 @@ ahd_reg_print_t ahd_selid_print;
 #endif
 
 #if AIC_DEBUG_REGISTERS
-ahd_reg_print_t ahd_sblkctl_print;
+ahd_reg_print_t ahd_optionmode_print;
 #else
-#define ahd_sblkctl_print(regvalue, cur_col, wrap) \
-ahd_print_register(NULL, 0, "SBLKCTL", 0x4a, regva

CVS commit: src/sys/dev/microcode/aic7xxx

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Sat Jun 27 16:19:39 UTC 2020

Modified Files:
src/sys/dev/microcode/aic7xxx: aicasm_macro_gram.y aicasm_scan.l
aicasm_symbol.c

Log Message:
make this compile with normal WARNS


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/microcode/aic7xxx/aicasm_macro_gram.y
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/microcode/aic7xxx/aicasm_scan.l
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/microcode/aic7xxx/aicasm_symbol.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/dev/microcode/aic7xxx/aicasm_macro_gram.y
diff -u src/sys/dev/microcode/aic7xxx/aicasm_macro_gram.y:1.2 src/sys/dev/microcode/aic7xxx/aicasm_macro_gram.y:1.3
--- src/sys/dev/microcode/aic7xxx/aicasm_macro_gram.y:1.2	Sat Nov 25 16:48:32 2006
+++ src/sys/dev/microcode/aic7xxx/aicasm_macro_gram.y	Sat Jun 27 16:19:38 2020
@@ -1,5 +1,5 @@
 %{
-/*	$NetBSD: aicasm_macro_gram.y,v 1.2 2006/11/25 16:48:32 christos Exp $	*/
+/*	$NetBSD: aicasm_macro_gram.y,v 1.3 2020/06/27 16:19:38 jdolecek Exp $	*/
 
 /*
  * Sub-parser for macro invocation in the Aic7xxx SCSI
@@ -66,6 +66,8 @@ static symbol_t *macro_symbol;
 
 static void add_macro_arg(const char *argtext, int position);
 
+int yylex(void);
+
 %}
 
 %union {

Index: src/sys/dev/microcode/aic7xxx/aicasm_scan.l
diff -u src/sys/dev/microcode/aic7xxx/aicasm_scan.l:1.5 src/sys/dev/microcode/aic7xxx/aicasm_scan.l:1.6
--- src/sys/dev/microcode/aic7xxx/aicasm_scan.l:1.5	Sun Dec 11 12:22:18 2005
+++ src/sys/dev/microcode/aic7xxx/aicasm_scan.l	Sat Jun 27 16:19:38 2020
@@ -1,5 +1,5 @@
 %{
-/*	$NetBSD: aicasm_scan.l,v 1.5 2005/12/11 12:22:18 christos Exp $	*/
+/*	$NetBSD: aicasm_scan.l,v 1.6 2020/06/27 16:19:38 jdolecek Exp $	*/
 /*
  * Lexical Analyzer for the Aic7xxx SCSI Host adapter sequencer assembler.
  *
@@ -60,6 +60,13 @@
 #include "aicasm_symbol.h"
 #include "aicasm_gram.h"
 
+int yyparse(void);
+void yy_delete_buffer(YY_BUFFER_STATE);
+int mmlex(void);
+int mmparse(void);
+void mm_delete_buffer(YY_BUFFER_STATE);
+void mm_switch_to_buffer(YY_BUFFER_STATE);
+
 /* This is used for macro body capture too, so err on the large size. */
 #define MAX_STR_CONST 4096
 static char string_buf[MAX_STR_CONST];

Index: src/sys/dev/microcode/aic7xxx/aicasm_symbol.c
diff -u src/sys/dev/microcode/aic7xxx/aicasm_symbol.c:1.6 src/sys/dev/microcode/aic7xxx/aicasm_symbol.c:1.7
--- src/sys/dev/microcode/aic7xxx/aicasm_symbol.c:1.6	Wed Mar 18 10:22:40 2009
+++ src/sys/dev/microcode/aic7xxx/aicasm_symbol.c	Sat Jun 27 16:19:38 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: aicasm_symbol.c,v 1.6 2009/03/18 10:22:40 cegger Exp $	*/
+/*	$NetBSD: aicasm_symbol.c,v 1.7 2020/06/27 16:19:38 jdolecek Exp $	*/
 
 /*
  * Aic7xxx SCSI host adapter firmware asssembler symbol table implementation
@@ -43,7 +43,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: aicasm_symbol.c,v 1.6 2009/03/18 10:22:40 cegger Exp $");
+__RCSID("$NetBSD: aicasm_symbol.c,v 1.7 2020/06/27 16:19:38 jdolecek Exp $");
 
 #include 
 
@@ -59,6 +59,7 @@ __RCSID("$NetBSD: aicasm_symbol.c,v 1.6 
 #include 
 #include 
 #include 
+#include 
 
 #include "aicasm_symbol.h"
 #include "aicasm.h"

CVS commit: src/sys/dev/microcode/aic7xxx

[Jaromir Dolecek]

Module Name:src
Committed By:   jdolecek
Date:   Sat Jun 27 16:00:35 UTC 2020

Modified Files:
src/sys/dev/microcode/aic7xxx: Makefile

Log Message:
make this work with objdir, drop unused -ll


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/microcode/aic7xxx/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/microcode/aic7xxx/Makefile
diff -u src/sys/dev/microcode/aic7xxx/Makefile:1.7 src/sys/dev/microcode/aic7xxx/Makefile:1.8
--- src/sys/dev/microcode/aic7xxx/Makefile:1.7	Sat Apr 19 19:26:10 2003
+++ src/sys/dev/microcode/aic7xxx/Makefile	Sat Jun 27 16:00:34 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.7 2003/04/19 19:26:10 fvdl Exp $
+#	$NetBSD: Makefile,v 1.8 2020/06/27 16:00:34 jdolecek Exp $
 
 7XXX_SEQ=	aic7xxx.seq
 7XXX_SEQHDR=	aic7xxx_seq.h
@@ -8,7 +8,7 @@
 79XX_SEQHDR=	aic79xx_seq.h
 79XX_REGHDR=	aic79xx_reg.h
 
-AICASMINCS=-I/usr/include -I${.CURDIR}/../../.. -I.
+AICASMINCS=-I/usr/include -I${.CURDIR}/../../.. -I. -I${.CURDIR}
 
 PROG=	aicasm
 
@@ -18,7 +18,7 @@ SRCS=	aicasm.c aicasm_symbol.c aicasm_sc
 YHEADER=1
 
 DPADD+= ${LIBL} ${LIBY}
-LDADD+= -ll -ly
+LDADD+= -ly
 
 NOSHARE=# defined
 
@@ -29,11 +29,12 @@ NOSHARE=# defined
 #
 LFLAGS+= ${.TARGET:M*macro*:S/$(.TARGET)/-Pmm/}
 YFLAGS+= ${.TARGET:M*macro*:S/$(.TARGET)/-p mm/}
+CPPFLAGS+=	-I${.CURDIR}
 
 regen: 7xxx_headers 79xx_headers
 
 7xxx_headers: ${PROG} ${7XXX_SEQ}
-	./${PROG} ${AICASMINCS} -o ${7XXX_SEQHDR} -r ${7XXX_REGHDR} ${7XXX_SEQ}
+	./${PROG} ${AICASMINCS} -o ${.CURDIR}/${7XXX_SEQHDR} -r ${.CURDIR}/${7XXX_REGHDR} ${.CURDIR}/${7XXX_SEQ}
 
 79xx_headers: ${PROG} ${79XX_SEQ}
-	./${PROG} ${AICASMINCS} -o ${79XX_SEQHDR} -r ${79XX_REGHDR} ${79XX_SEQ}
+	./${PROG} ${AICASMINCS} -o ${.CURDIR}/${79XX_SEQHDR} -r ${.CURDIR}/${79XX_REGHDR} ${.CURDIR}/${79XX_SEQ}

CVS commit: src/sys/dev/microcode/aic7xxx

[Maxime Villard]

Module Name:src
Committed By:   maxv
Date:   Mon Aug 15 08:52:33 UTC 2016

Modified Files:
src/sys/dev/microcode/aic7xxx: aicasm.c

Log Message:
This thing is completely buggy. There is a use-after-free and NULL pointer
dereference. Just fix the uaf, and add a comment. Not tested, but obvious
enough; found by brainy.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/microcode/aic7xxx/aicasm.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/dev/microcode/aic7xxx/aicasm.c
diff -u src/sys/dev/microcode/aic7xxx/aicasm.c:1.8 src/sys/dev/microcode/aic7xxx/aicasm.c:1.9
--- src/sys/dev/microcode/aic7xxx/aicasm.c:1.8	Sun Dec 27 16:03:49 2009
+++ src/sys/dev/microcode/aic7xxx/aicasm.c	Mon Aug 15 08:52:33 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: aicasm.c,v 1.8 2009/12/27 16:03:49 jakllsch Exp $	*/
+/*	$NetBSD: aicasm.c,v 1.9 2016/08/15 08:52:33 maxv Exp $	*/
 
 /*
  * Aic7xxx SCSI host adapter firmware asssembler
@@ -43,7 +43,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: aicasm.c,v 1.8 2009/12/27 16:03:49 jakllsch Exp $");
+__RCSID("$NetBSD: aicasm.c,v 1.9 2016/08/15 08:52:33 maxv Exp $");
 
 #include 
 #include 
@@ -595,6 +595,7 @@ output_listing(char *ifilename)
 putchar(input);
 		}
 		free(func_values);
+		func_values = NULL;
 		fprintf(stdout, "\nThanks!\n");
 	}
 
@@ -604,6 +605,11 @@ output_listing(char *ifilename)
 	 cur_instr != NULL;
 	 cur_instr = STAILQ_NEXT(cur_instr, links), instrcount++) {
 
+		/*
+		 * XXX XXX XXX: What exactly are we trying to do here?
+		 * 'func_values' is always NULL, so check_patch will
+		 * necessarily crash.
+		 */
 		if (check_patch(&cur_patch, instrcount,
 &skip_addr, func_values) == 0) {
 			/* Don't count this instruction as it is in a patch

CVS commit: src/sys/dev/microcode/aic7xxx

[Jonathan A. Kollasch]

Module Name:src
Committed By:   jakllsch
Date:   Sun Dec 27 16:03:49 UTC 2009

Modified Files:
src/sys/dev/microcode/aic7xxx: aicasm.c

Log Message:
Free memory when done with it.
>From Henning Petersen in PR/42522.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/microcode/aic7xxx/aicasm.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/dev/microcode/aic7xxx/aicasm.c
diff -u src/sys/dev/microcode/aic7xxx/aicasm.c:1.7 src/sys/dev/microcode/aic7xxx/aicasm.c:1.8
--- src/sys/dev/microcode/aic7xxx/aicasm.c:1.7	Wed Mar 18 10:22:40 2009
+++ src/sys/dev/microcode/aic7xxx/aicasm.c	Sun Dec 27 16:03:49 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: aicasm.c,v 1.7 2009/03/18 10:22:40 cegger Exp $	*/
+/*	$NetBSD: aicasm.c,v 1.8 2009/12/27 16:03:49 jakllsch Exp $	*/
 
 /*
  * Aic7xxx SCSI host adapter firmware asssembler
@@ -43,7 +43,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: aicasm.c,v 1.7 2009/03/18 10:22:40 cegger Exp $");
+__RCSID("$NetBSD: aicasm.c,v 1.8 2009/12/27 16:03:49 jakllsch Exp $");
 
 #include 
 #include 
@@ -594,6 +594,7 @@
 			if (isatty(fileno(stdin)) == 0)
 putchar(input);
 		}
+		free(func_values);
 		fprintf(stdout, "\nThanks!\n");
 	}