Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: azonenberg/yosys
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 10c7709e68e6
Choose a base ref
...
head repository: azonenberg/yosys
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dbb2f755c115
Choose a head ref
  • 4 commits
  • 3 files changed
  • 2 contributors

Commits on Jul 14, 2017

  1. Copy the full SHA
    c00d8a5 View commit details

Commits on Jul 17, 2017

  1. Fix build warnings for win64

    Win64 has a 32-bit long. Use intptr_t to work on any data model.
    ArcaneNibble committed Jul 17, 2017
    Copy the full SHA
    f074169 View commit details
  2. Copy the full SHA
    85d667c View commit details

Commits on Jul 18, 2017

  1. Merge pull request YosysHQ#363 from rqou/master

    Miscellaneous build tweaks
    cliffordwolf authored Jul 18, 2017
    Copy the full SHA
    dbb2f75 View commit details
Showing with 7 additions and 2 deletions.
  1. +5 −0 Makefile
  2. +1 −1 kernel/hashlib.h
  3. +1 −1 passes/cmds/stat.cc
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@ ENABLE_LIBYOSYS := 0
ENABLE_GPROF := 0
ENABLE_NDEBUG := 0
LINK_CURSES := 0
LINK_TERMCAP := 0

# clang sanitizers
SANITIZER =
@@ -213,6 +214,10 @@ ifeq ($(LINK_CURSES),1)
LDLIBS += -lcurses
ABCMKARGS += "ABC_READLINE_LIBRARIES=-lcurses -lreadline"
endif
ifeq ($(LINK_TERMCAP),1)
LDLIBS += -ltermcap
ABCMKARGS += "ABC_READLINE_LIBRARIES=-lreadline -ltermcap"
endif
ifeq ($(CONFIG),mxe)
LDLIBS += -ltermcap
endif
2 changes: 1 addition & 1 deletion kernel/hashlib.h
Original file line number Diff line number Diff line change
@@ -147,7 +147,7 @@ struct hash_ptr_ops {
return a == b;
}
static inline unsigned int hash(const void *a) {
return (unsigned long)a;
return (intptr_t)a;
}
};

2 changes: 1 addition & 1 deletion passes/cmds/stat.cc
Original file line number Diff line number Diff line change
@@ -112,7 +112,7 @@ struct statdata_t
"$lut", "$and", "$or", "$xor", "$xnor",
"$shl", "$shr", "$sshl", "$sshr", "$shift", "$shiftx",
"$lt", "$le", "$eq", "$ne", "$eqx", "$nex", "$ge", "$gt",
"$add", "$sub", "$mul", "$div", "$mod", "$pow")) {
"$add", "$sub", "$mul", "$div", "$mod", "$pow", "$alu")) {
int width_a = it.second->hasPort("\\A") ? GetSize(it.second->getPort("\\A")) : 0;
int width_b = it.second->hasPort("\\B") ? GetSize(it.second->getPort("\\B")) : 0;
int width_y = it.second->hasPort("\\Y") ? GetSize(it.second->getPort("\\Y")) : 0;