Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 33e01c8

Browse files
committedAug 9, 2016
Merge branch 'pugixml'
This replaces the old ezxml XML parser with a newer, more robust XML parser pugixml. This fixes several nagging issues: * Memory leaks caused by ezxml's string handling * Some unreasonable XML syntax constraints (e.g. tags of the same type must be together -- in ezxml not following this caused a segfault) The MIT-licensed pugixl parser (pugixml.org) is checked-in under libpugixml/ it has no modifications and so should be easily upgrade-able. Some common code was moved into libvtrutil/ which contains generally useful and re-usable code for use across VTR. Some useful utilities for working with pugixml are included in libvtrutil: * In the pugiutil:: namespace - utilities for performing error checks when accessing XML data (e.g. error if tag does not exist) * In the pugiloc:: namespace - utilities for getting line numbers from xml elements (used for error reporting) Conflicts: libarchfpga/read_xml_arch_file.c vpr/SRC/base/OptionTokens.h vpr/SRC/base/ReadOptions.c vpr/SRC/base/ReadOptions.h
2 parents 36aaaa1 + 33bcd59 commit 33e01c8

File tree

108 files changed

+28838
-6640
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+28838
-6640
lines changed
 

‎ODIN_II/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ ABC_INC = -I $(ABC_DIR)/src/bdd/cudd -I $(ABC_DIR)/src/bdd/epd -I $(ABC_DIR)/src
2020
# Use this value of OPT_FLAGS to simulate in parallel (requires GCC >= 4.2)
2121
#OPT_FLAGS = -O2 -fopenmp
2222

23-
INC_FLAGS = -I../libarchfpga/include -I../libcommon_c++/SRC/TIO_InputOutputHandlers $(ABC_INC)
23+
INC_FLAGS = -I../libarchfpga/include -I../libpugixml/src -I../libvtrutil/src -I../libcommon_c++/SRC/TIO_InputOutputHandlers $(ABC_INC)
2424
LIB = -L../libarchfpga -larchfpga -lm -ldl
2525
C_DIRECTIVE = -DVPR6 -DUSING_BISON
2626

27-
FLAGS = $(DEBUG_FLAGS) $(WARN_FLAGS) $(OPT_FLAGS) $(INC_FLAGS)
27+
FLAGS = $(DEBUG_FLAGS) $(WARN_FLAGS) $(OPT_FLAGS) $(INC_FLAGS) -std=c++0x
2828
C_FLAGS = $(C_DIRECTIVE)
2929

3030
YFILES = $(SRC_DIR)/verilog_bison.y

‎ODIN_II/README.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ Odin will link the libarchfpga library located in:
1212
By default Odin II uses libarchfpga_6. To compile it, change directory to
1313
../libarchfpga_6 and type "make".
1414

15-
Note:
16-
- for WIN32 compilation you'll have to edit the ezxml.c files
17-
to "#define WIN32" or not.
18-
1915
2. Odin II
2016

2117
Odin is compiled with a standard Makefile. For the first time

0 commit comments

Comments
 (0)
Please sign in to comment.