CVS commit: src/sys/arch/ia64/disasm

2016-08-05 Thread Sean Cole 
Module Name:src
Committed By:   scole
Date:   Fri Aug  5 16:45:50 UTC 2016

Modified Files:
src/sys/arch/ia64/disasm: disasm.h disasm_decode.c disasm_extract.c
disasm_format.c disasm_int.h

Log Message:
PR port-ia64/51261

Import later version from FreeBSD


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/disasm/disasm.h \
src/sys/arch/ia64/disasm/disasm_extract.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/disasm/disasm_decode.c \
src/sys/arch/ia64/disasm/disasm_int.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/disasm/disasm_format.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/ia64/disasm/disasm.h
diff -u src/sys/arch/ia64/disasm/disasm.h:1.2 src/sys/arch/ia64/disasm/disasm.h:1.3
--- src/sys/arch/ia64/disasm/disasm.h:1.2	Thu Apr  3 17:02:34 2014
+++ src/sys/arch/ia64/disasm/disasm.h	Fri Aug  5 16:45:50 2016
@@ -1,7 +1,7 @@
-/*	$NetBSD: disasm.h,v 1.2 2014/04/03 17:02:34 martin Exp $	*/
+/*	$NetBSD: disasm.h,v 1.3 2016/08/05 16:45:50 scole Exp $	*/
 
 /*-
- * Copyright (c) 2000-2003 Marcel Moolenaar
+ * Copyright (c) 2000-2006 Marcel Moolenaar
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/ia64/disasm/disasm.h,v 1.3 2005/01/06 22:18:22 imp Exp $
+ * $FreeBSD: releng/10.1/sys/ia64/disasm/disasm.h 172689 2007-10-16 02:49:40Z marcel $
  */
 
 #ifndef _DISASM_H_
@@ -112,6 +112,7 @@ enum asm_cmpltr_class {
 	ASM_CC_RW,
 	ASM_CC_TREL, ASM_CC_TRUNC,
 	ASM_CC_UNIT, ASM_CC_UNPACK, ASM_CC_UNS,
+	ASM_CC_VMSW,
 	ASM_CC_XMA
 };
 
@@ -205,15 +206,16 @@ enum asm_fmt {
 	ASM_FMT_F1,  ASM_FMT_F2,  ASM_FMT_F3,  ASM_FMT_F4,
 	ASM_FMT_F5,  ASM_FMT_F6,  ASM_FMT_F7,  ASM_FMT_F8,
 	ASM_FMT_F9,  ASM_FMT_F10, ASM_FMT_F11, ASM_FMT_F12,
-	ASM_FMT_F13, ASM_FMT_F14, ASM_FMT_F15,
+	ASM_FMT_F13, ASM_FMT_F14, ASM_FMT_F15, ASM_FMT_F16,
 	ASM_FMT_I = 0x0400,
 	ASM_FMT_I1,  ASM_FMT_I2,  ASM_FMT_I3,  ASM_FMT_I4,
 	ASM_FMT_I5,  ASM_FMT_I6,  ASM_FMT_I7,  ASM_FMT_I8,
 	ASM_FMT_I9,  ASM_FMT_I10, ASM_FMT_I11, ASM_FMT_I12,
 	ASM_FMT_I13, ASM_FMT_I14, ASM_FMT_I15, ASM_FMT_I16,
-	ASM_FMT_I17, ASM_FMT_I19, ASM_FMT_I20, ASM_FMT_I21,
-	ASM_FMT_I22, ASM_FMT_I23, ASM_FMT_I24, ASM_FMT_I25,
-	ASM_FMT_I26, ASM_FMT_I27, ASM_FMT_I28, ASM_FMT_I29,
+	ASM_FMT_I17, ASM_FMT_I18, ASM_FMT_I19, ASM_FMT_I20,
+	ASM_FMT_I21, ASM_FMT_I22, ASM_FMT_I23, ASM_FMT_I24,
+	ASM_FMT_I25, ASM_FMT_I26, ASM_FMT_I27, ASM_FMT_I28,
+	ASM_FMT_I29, ASM_FMT_I30,
 	ASM_FMT_M = 0x0500,
 	ASM_FMT_M1,  ASM_FMT_M2,  ASM_FMT_M3,  ASM_FMT_M4,
 	ASM_FMT_M5,  ASM_FMT_M6,  ASM_FMT_M7,  ASM_FMT_M8,
@@ -226,9 +228,10 @@ enum asm_fmt {
 	ASM_FMT_M33, ASM_FMT_M34, ASM_FMT_M35, ASM_FMT_M36,
 	ASM_FMT_M37, ASM_FMT_M38, ASM_FMT_M39, ASM_FMT_M40,
 	ASM_FMT_M41, ASM_FMT_M42, ASM_FMT_M43, ASM_FMT_M44,
-	ASM_FMT_M45, ASM_FMT_M46,
+	ASM_FMT_M45, ASM_FMT_M46, ASM_FMT_M47, ASM_FMT_M48,
 	ASM_FMT_X = 0x0600,
-	ASM_FMT_X1,  ASM_FMT_X2,  ASM_FMT_X3,  ASM_FMT_X4
+	ASM_FMT_X1,  ASM_FMT_X2,  ASM_FMT_X3,  ASM_FMT_X4,
+	ASM_FMT_X5
 };
 
 /* Instruction opcodes. */
@@ -252,6 +255,7 @@ enum asm_op {
 	ASM_OP_FPRSQRTA, ASM_OP_FRCPA, ASM_OP_FRSQRTA, ASM_OP_FSELECT,
 	ASM_OP_FSETC, ASM_OP_FSWAP, ASM_OP_FSXT, ASM_OP_FWB, ASM_OP_FXOR,
 	ASM_OP_GETF,
+	ASM_OP_HINT,
 	ASM_OP_INVALA, ASM_OP_ITC, ASM_OP_ITR,
 	ASM_OP_LD1, ASM_OP_LD16, ASM_OP_LD2, ASM_OP_LD4, ASM_OP_LD8,
 	ASM_OP_LDF, ASM_OP_LDF8, ASM_OP_LDFD, ASM_OP_LDFE, ASM_OP_LDFP8,
@@ -273,9 +277,10 @@ enum asm_op {
 	ASM_OP_ST2, ASM_OP_ST4, ASM_OP_ST8, ASM_OP_STF, ASM_OP_STF8,
 	ASM_OP_STFD, ASM_OP_STFE, ASM_OP_STFS, ASM_OP_SUB, ASM_OP_SUM,
 	ASM_OP_SXT1, ASM_OP_SXT2, ASM_OP_SXT4, ASM_OP_SYNC,
-	ASM_OP_TAK, ASM_OP_TBIT, ASM_OP_THASH, ASM_OP_TNAT, ASM_OP_TPA,
-	ASM_OP_TTAG,
+	ASM_OP_TAK, ASM_OP_TBIT, ASM_OP_TF, ASM_OP_THASH, ASM_OP_TNAT,
+	ASM_OP_TPA, ASM_OP_TTAG,
 	ASM_OP_UNPACK1, ASM_OP_UNPACK2, ASM_OP_UNPACK4,
+	ASM_OP_VMSW,
 	ASM_OP_XCHG1, ASM_OP_XCHG2, ASM_OP_XCHG4, ASM_OP_XCHG8, ASM_OP_XMA,
 	ASM_OP_XOR,
 	ASM_OP_ZXT1, ASM_OP_ZXT2, ASM_OP_ZXT4,
Index: src/sys/arch/ia64/disasm/disasm_extract.c
diff -u src/sys/arch/ia64/disasm/disasm_extract.c:1.2 src/sys/arch/ia64/disasm/disasm_extract.c:1.3
--- src/sys/arch/ia64/disasm/disasm_extract.c:1.2	Sun Jul 17 20:54:42 2011
+++ src/sys/arch/ia64/disasm/disasm_extract.c	Fri Aug  5 16:45:50 2016
@@ -1,7 +1,7 @@
-/*	$NetBSD: disasm_extract.c,v 1.2 2011/07/17 20:54:42 joerg Exp $	*/
+/*	$NetBSD: disasm_extract.c,v 1.3 2016/08/05 16:45:50 scole Exp $	*/
 
 /*-
- * Copyright (c) 2000-2003 Marcel Moolenaar
+ * Copyright (c) 2000-2006 Marcel Moolenaar
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
  */
 
 #include 
-/* __FBSDID("$FreeBSD:

CVS commit: src/sys/arch/ia64/disasm

2014-04-03 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Thu Apr  3 17:02:34 UTC 2014

Modified Files:
src/sys/arch/ia64/disasm: disasm.h disasm_format.c

Log Message:
Fix snprintf fallout


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/disasm/disasm.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/disasm/disasm_format.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/ia64/disasm/disasm.h
diff -u src/sys/arch/ia64/disasm/disasm.h:1.1 src/sys/arch/ia64/disasm/disasm.h:1.2
--- src/sys/arch/ia64/disasm/disasm.h:1.1	Fri Apr  7 14:21:18 2006
+++ src/sys/arch/ia64/disasm/disasm.h	Thu Apr  3 17:02:34 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: disasm.h,v 1.1 2006/04/07 14:21:18 cherry Exp $	*/
+/*	$NetBSD: disasm.h,v 1.2 2014/04/03 17:02:34 martin Exp $	*/
 
 /*-
  * Copyright (c) 2000-2003 Marcel Moolenaar
@@ -316,9 +316,9 @@ int asm_extract(enum asm_op, enum asm_fm
 
 int asm_decode(uint64_t, struct asm_bundle *);
 
-void asm_completer(const struct asm_cmpltr *, char *);
-void asm_mnemonic(const enum asm_op, char *);
-void asm_operand(const struct asm_oper *, char *, uint64_t);
+void asm_completer(const struct asm_cmpltr *, char *, size_t);
+void asm_mnemonic(const enum asm_op, char *, size_t);
+void asm_operand(const struct asm_oper *, char *, size_t, uint64_t);
 void asm_print_bundle(const struct asm_bundle *, uint64_t);
 void asm_print_inst(const struct asm_bundle *, int, uint64_t);
 

Index: src/sys/arch/ia64/disasm/disasm_format.c
diff -u src/sys/arch/ia64/disasm/disasm_format.c:1.3 src/sys/arch/ia64/disasm/disasm_format.c:1.4
--- src/sys/arch/ia64/disasm/disasm_format.c:1.3	Thu Mar 27 18:22:56 2014
+++ src/sys/arch/ia64/disasm/disasm_format.c	Thu Apr  3 17:02:34 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: disasm_format.c,v 1.3 2014/03/27 18:22:56 christos Exp $	*/
+/*	$NetBSD: disasm_format.c,v 1.4 2014/04/03 17:02:34 martin Exp $	*/
 
 /*-
  * Copyright (c) 2000-2003 Marcel Moolenaar
@@ -287,7 +287,7 @@ asm_operand(const struct asm_oper *o, ch
 	case 12: l = strlcpy(buf, sp, buflen); break;
 	case 13: l = strlcpy(buf, tp, buflen); break;
 	default:
-	l += snprintf(buf, buflen, r%d, (int)o-o_value);
+	l = snprintf(buf, buflen, r%d, (int)o-o_value);
 	if (l  buflen)
 		l = buflen;
 	break;