diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-07-09 12:16:33 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-07-09 12:16:33 -0700 |
| commit | bee5d2b21a721b5b2d28cc9326b3d51573167038 (patch) | |
| tree | 464486a5bd584c36d7b4059b461fcb479115796e | |
| parent | 93522b0ae15466297e45edecf55f7e33c4ebcc1c (diff) | |
| parent | c2db70f41e2697d141439c093813ae48f3b7a5d4 (diff) | |
| download | yosys-bee5d2b21a721b5b2d28cc9326b3d51573167038.tar.gz yosys-bee5d2b21a721b5b2d28cc9326b3d51573167038.tar.bz2 yosys-bee5d2b21a721b5b2d28cc9326b3d51573167038.zip | |
Merge remote-tracking branch 'origin/eddie/fix1173' into xc7mux
| -rw-r--r-- | backends/aiger/xaiger.cc | 10 | ||||
| -rw-r--r-- | passes/techmap/techmap.cc | 3 |
2 files changed, 9 insertions, 4 deletions
diff --git a/backends/aiger/xaiger.cc b/backends/aiger/xaiger.cc index 869b741a6..69f63486c 100644 --- a/backends/aiger/xaiger.cc +++ b/backends/aiger/xaiger.cc @@ -21,13 +21,15 @@ // https://stackoverflow.com/a/46137633 #ifdef _MSC_VER #include <stdlib.h> -#define __builtin_bswap32 _byteswap_ulong +#define bswap32 _byteswap_ulong #elif defined(__APPLE__) #include <libkern/OSByteOrder.h> -#define __builtin_bswap32 OSSwapInt32 -#elif !defined(__GNUC__) +#define bswap32 OSSwapInt32 +#elif defined(__GNUC__) +#define bswap32 __builtin_bswap32 +#else #include <cstdint> -inline uint32_t __builtin_bswap32(uint32_t x) +inline static uint32_t bswap32(uint32_t x) { // https://stackoverflow.com/a/27796212 register uint32_t value = number_to_be_reversed; diff --git a/passes/techmap/techmap.cc b/passes/techmap/techmap.cc index ab0bd3b54..ceb053825 100644 --- a/passes/techmap/techmap.cc +++ b/passes/techmap/techmap.cc @@ -649,10 +649,13 @@ struct TechmapWorker unique_bit_id[bit] = unique_bit_id_counter++; } + // Find highest bit set int bits = 0; for (int i = 0; i < 32; i++) if (((unique_bit_id_counter-1) & (1 << i)) != 0) bits = i; + // Increment index by one to get number of bits + bits++; if (tpl->avail_parameters.count("\\_TECHMAP_BITS_CONNMAP_")) parameters["\\_TECHMAP_BITS_CONNMAP_"] = bits; |