luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update lxt_write.h and lxt2_write.h from GTKWave 

This patch updates the lxt_write.h and lxt2_write.h header files
to the latest ones from GTKWave CVS. It also adds HAVE_INTTYPES_H
to the vpi_config.h.in header.
(cherry picked from commit bf54c838a6)
This commit is contained in:
Cary R 2010-04-30 10:07:39 -07:00 committed by Stephen Williams
parent 385b211851
commit eed962c787
3 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
vpi/lxt2_write.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003-2004 Tony Bybell. * Copyright (c) 2003-2010 Tony Bybell.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -23,13 +23,19 @@
#ifndef DEFS_LXTW_H #ifndef DEFS_LXTW_H
#define DEFS_LXTW_H #define DEFS_LXTW_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#ifdef HAVE_INTTYPES_H
#include <inttypes.h> #include <inttypes.h>
#endif
#include <zlib.h> #include <zlib.h>
#ifndef HAVE_FSEEKO #ifndef HAVE_FSEEKO
@ -300,11 +306,21 @@ int lxt2_wr_emit_value_double(struct lxt2_wr_trace *lt, struct lxt2_wr_symbol
int lxt2_wr_emit_value_string(struct lxt2_wr_trace *lt, struct lxt2_wr_symbol *s, unsigned int row, char *value); int lxt2_wr_emit_value_string(struct lxt2_wr_trace *lt, struct lxt2_wr_symbol *s, unsigned int row, char *value);
int lxt2_wr_emit_value_bit_string(struct lxt2_wr_trace *lt, struct lxt2_wr_symbol *s, unsigned int row, char *value); int lxt2_wr_emit_value_bit_string(struct lxt2_wr_trace *lt, struct lxt2_wr_symbol *s, unsigned int row, char *value);
#ifdef __cplusplus
}
#endif
#endif #endif
/* /*
* $Id: lxt2_write.h,v 1.1.1.1 2007/05/30 04:28:25 gtkwave Exp $ * $Id: lxt2_write.h,v 1.3 2010/04/27 23:10:56 gtkwave Exp $
* $Log: lxt2_write.h,v $ * $Log: lxt2_write.h,v $
* Revision 1.3 2010/04/27 23:10:56 gtkwave
* made inttype.h inclusion conditional
*
* Revision 1.2 2010/02/18 17:27:07 gtkwave
* extern "C" headers / version bump
*
* Revision 1.1.1.1 2007/05/30 04:28:25 gtkwave * Revision 1.1.1.1 2007/05/30 04:28:25 gtkwave
* Imported sources * Imported sources
* *
@ -312,4 +328,3 @@ int lxt2_wr_emit_value_bit_string(struct lxt2_wr_trace *lt, struct lxt2_wr_sy
* initial release * initial release
* *
*/ */

30
vpi/lxt_write.h
View File

@ -23,6 +23,10 @@
#ifndef DEFS_LXT_H #ifndef DEFS_LXT_H
#define DEFS_LXT_H #define DEFS_LXT_H
#ifdef __cplusplus
extern "C" {
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -31,6 +35,9 @@
#include <unistd.h> #include <unistd.h>
#include <zlib.h> #include <zlib.h>
#include <bzlib.h> #include <bzlib.h>
#ifdef HAVE_INTTYPES_H
#include <inttypes.h>
#endif
#ifndef HAVE_FSEEKO #ifndef HAVE_FSEEKO
#define fseeko fseek #define fseeko fseek
@ -62,8 +69,14 @@ struct dslxt_tree_node {
enum lt_zmode_types { LT_ZMODE_NONE, LT_ZMODE_GZIP, LT_ZMODE_BZIP2 }; enum lt_zmode_types { LT_ZMODE_NONE, LT_ZMODE_GZIP, LT_ZMODE_BZIP2 };
typedef unsigned long long lxttime_t; #ifndef _MSC_VER
typedef uint64_t lxttime_t;
#define ULLDescriptor(x) x##ULL #define ULLDescriptor(x) x##ULL
#else
typedef unsigned __int64 lxttime_t;
#define ULLDescriptor(x) x##i64
#endif
struct lt_timetrail struct lt_timetrail
{ {
@ -246,11 +259,24 @@ int lt_emit_value_double(struct lt_trace *lt, struct lt_symbol *s, unsigned i
int lt_emit_value_string(struct lt_trace *lt, struct lt_symbol *s, unsigned int row, char *value); int lt_emit_value_string(struct lt_trace *lt, struct lt_symbol *s, unsigned int row, char *value);
int lt_emit_value_bit_string(struct lt_trace *lt, struct lt_symbol *s, unsigned int row, char *value); int lt_emit_value_bit_string(struct lt_trace *lt, struct lt_symbol *s, unsigned int row, char *value);
#ifdef __cplusplus
}
#endif
#endif #endif
/* /*
* $Id: lxt_write.h,v 1.1.1.1 2007/05/30 04:28:15 gtkwave Exp $ * $Id: lxt_write.h,v 1.4 2010/04/27 23:10:56 gtkwave Exp $
* $Log: lxt_write.h,v $ * $Log: lxt_write.h,v $
* Revision 1.4 2010/04/27 23:10:56 gtkwave
* made inttype.h inclusion conditional
*
* Revision 1.3 2010/03/18 17:12:37 gtkwave
* pedantic warning cleanups
*
* Revision 1.2 2010/02/18 17:27:07 gtkwave
* extern "C" headers / version bump
*
* Revision 1.1.1.1 2007/05/30 04:28:15 gtkwave * Revision 1.1.1.1 2007/05/30 04:28:15 gtkwave
* Imported sources * Imported sources
* *

3
vpi/vpi_config.h.in
View File

@ -1,7 +1,7 @@
#ifndef __vpi_config_H #ifndef __vpi_config_H
#define __vpi_config_H #define __vpi_config_H
/* /*
* Copyright (c) 2004-2009 Stephen Williams (steve@icarus.com) * Copyright (c) 2004-2010 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -21,6 +21,7 @@
# undef HAVE_LIBIBERTY_H # undef HAVE_LIBIBERTY_H
# undef HAVE_MALLOC_H # undef HAVE_MALLOC_H
# undef HAVE_INTTYPES_H
# undef HAVE_LIBZ # undef HAVE_LIBZ
# undef HAVE_LIBBZ2 # undef HAVE_LIBBZ2
# undef HAVE_FMIN # undef HAVE_FMIN