riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/eddie/fix1173' into xc7mux

This commit is contained in:
Eddie Hung 2019-07-09 12:16:33 -07:00
parent 93522b0ae1 c2db70f41e
commit bee5d2b21a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backends/aiger/xaiger.cc
View File

@ -21,13 +21,15 @@
// https://stackoverflow.com/a/46137633 // https://stackoverflow.com/a/46137633
#ifdef _MSC_VER #ifdef _MSC_VER
#include <stdlib.h> #include <stdlib.h>
#define __builtin_bswap32 _byteswap_ulong #define bswap32 _byteswap_ulong
#elif defined(__APPLE__) #elif defined(__APPLE__)
#include <libkern/OSByteOrder.h> #include <libkern/OSByteOrder.h>
#define __builtin_bswap32 OSSwapInt32 #define bswap32 OSSwapInt32
#elif !defined(__GNUC__) #elif defined(__GNUC__)
#define bswap32 __builtin_bswap32
#else
#include <cstdint> #include <cstdint>
inline uint32_t __builtin_bswap32(uint32_t x) inline static uint32_t bswap32(uint32_t x)
{ {
// https://stackoverflow.com/a/27796212 // https://stackoverflow.com/a/27796212
register uint32_t value = number_to_be_reversed; register uint32_t value = number_to_be_reversed;

3
passes/techmap/techmap.cc
View File

@ -649,10 +649,13 @@ struct TechmapWorker
unique_bit_id[bit] = unique_bit_id_counter++; unique_bit_id[bit] = unique_bit_id_counter++;
} }
// Find highest bit set
int bits = 0; int bits = 0;
for (int i = 0; i < 32; i++) for (int i = 0; i < 32; i++)
if (((unique_bit_id_counter-1) & (1 << i)) != 0) if (((unique_bit_id_counter-1) & (1 << i)) != 0)
bits = i; bits = i;
// Increment index by one to get number of bits
bits++;
if (tpl->avail_parameters.count("\\_TECHMAP_BITS_CONNMAP_")) if (tpl->avail_parameters.count("\\_TECHMAP_BITS_CONNMAP_"))
parameters["\\_TECHMAP_BITS_CONNMAP_"] = bits; parameters["\\_TECHMAP_BITS_CONNMAP_"] = bits;