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

Merge pull request #4794 from YosysHQ/krys/cygwin_compat 

Fix Cygwin compatibility
This commit is contained in:
KrystalDelusion 2024-12-05 09:16:18 +13:00 committed by GitHub
parent c96d02b204 7d8140ddea
commit c61b2bc1bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/mem.cc
View File

@ -1680,8 +1680,6 @@ SigSpec MemWr::decompress_en(const std::vector<int> &swizzle, SigSpec sig) {
return res; return res;
} }
using addr_t = MemContents::addr_t;
MemContents::MemContents(Mem *mem) : MemContents::MemContents(Mem *mem) :
MemContents(ceil_log2(mem->size), mem->width) MemContents(ceil_log2(mem->size), mem->width)
{ {
@ -1758,7 +1756,7 @@ bool MemContents::_range_overlaps(std::map<addr_t, RTLIL::Const>::iterator it, a
return !(top1 < begin_addr || top2 < _range_begin(it)); return !(top1 < begin_addr || top2 < _range_begin(it));
} }
std::map<addr_t, RTLIL::Const>::iterator MemContents::_range_at(addr_t addr) const { std::map<MemContents::addr_t, RTLIL::Const>::iterator MemContents::_range_at(addr_t addr) const {
// allow addr == 1<<_addr_width (which will just return end()) // allow addr == 1<<_addr_width (which will just return end())
log_assert(addr <= (addr_t)(1<<_addr_width)); log_assert(addr <= (addr_t)(1<<_addr_width));
// get the first range with base > addr // get the first range with base > addr
@ -1786,7 +1784,7 @@ RTLIL::Const MemContents::operator[](addr_t addr) const {
return _default_value; return _default_value;
} }
addr_t MemContents::count_range(addr_t begin_addr, addr_t end_addr) const { MemContents::addr_t MemContents::count_range(addr_t begin_addr, addr_t end_addr) const {
addr_t count = 0; addr_t count = 0;
for(auto it = _range_at(begin_addr); _range_overlaps(it, begin_addr, end_addr); it++) { for(auto it = _range_at(begin_addr); _range_overlaps(it, begin_addr, end_addr); it++) {
auto first = std::max(_range_begin(it), begin_addr); auto first = std::max(_range_begin(it), begin_addr);
@ -1829,7 +1827,7 @@ void MemContents::clear_range(addr_t begin_addr, addr_t end_addr) {
_values.erase(begin_it, end_it); _values.erase(begin_it, end_it);
} }
std::map<addr_t, RTLIL::Const>::iterator MemContents::_reserve_range(addr_t begin_addr, addr_t end_addr) { std::map<MemContents::addr_t, RTLIL::Const>::iterator MemContents::_reserve_range(addr_t begin_addr, addr_t end_addr) {
if(begin_addr >= end_addr) if(begin_addr >= end_addr)
return _values.end(); // need a dummy value to return, end() is cheap return _values.end(); // need a dummy value to return, end() is cheap
// find the first range containing any addr >= begin_addr - 1 // find the first range containing any addr >= begin_addr - 1

2
libs/fst/00_PATCH_win_io.patch
View File

@ -43,7 +43,7 @@
* mmap compatibility * mmap compatibility
*/ */
-#if defined __MINGW32__ -#if defined __MINGW32__
+#if defined __CYGWIN__ || defined __MINGW32__ || defined _MSC_VER +#if defined __MINGW32__ || defined _MSC_VER
#include <limits.h> #include <limits.h>
#define fstMmap(__addr,__len,__prot,__flags,__fd,__off) fstMmap2((__len), (__fd), (__off)) #define fstMmap(__addr,__len,__prot,__flags,__fd,__off) fstMmap2((__len), (__fd), (__off))
#define fstMunmap(__addr,__len) UnmapViewOfFile((LPCVOID)__addr) #define fstMunmap(__addr,__len) UnmapViewOfFile((LPCVOID)__addr)

2
libs/fst/fstapi.cc
View File

@ -341,7 +341,7 @@ return(NULL);
/* /*
* mmap compatibility * mmap compatibility
*/ */
#if defined __CYGWIN__ || defined __MINGW32__ || defined _MSC_VER #if defined __MINGW32__ || defined _MSC_VER
#include <limits.h> #include <limits.h>
#define fstMmap(__addr,__len,__prot,__flags,__fd,__off) fstMmap2((__len), (__fd), (__off)) #define fstMmap(__addr,__len,__prot,__flags,__fd,__off) fstMmap2((__len), (__fd), (__off))
#define fstMunmap(__addr,__len) UnmapViewOfFile((LPCVOID)__addr) #define fstMunmap(__addr,__len) UnmapViewOfFile((LPCVOID)__addr)