diff --git a/src/spider/runtime/cpu/InstrReelDyn.cpp b/src/spider/runtime/cpu/InstrReelDyn.cpp index 150e0b8..2e66a25 100644 --- a/src/spider/runtime/cpu/InstrReelDyn.cpp +++ b/src/spider/runtime/cpu/InstrReelDyn.cpp @@ -29,6 +29,7 @@ namespace spider { _block_index = copy._block_index; _blocks = copy._blocks; if (_block_index < _blocks.size()) selectBlock(_block_index); + return *this; } InstrReelDyn& InstrReelDyn::operator=(InstrReelDyn&& move) noexcept { @@ -43,6 +44,7 @@ namespace spider { move._offset = 0; move._size = 0; move._total_size = 0; + return *this; } void InstrReelDyn::growToFit(isize index) { diff --git a/src/spider/runtime/memory/Types.hpp b/src/spider/runtime/memory/Types.hpp index 7d250ee..6c80507 100644 --- a/src/spider/runtime/memory/Types.hpp +++ b/src/spider/runtime/memory/Types.hpp @@ -11,6 +11,8 @@ #include #endif +#include + namespace spider { /* @@ -148,7 +150,7 @@ namespace spider { #if SPIDER_LITTLE_ENDIAN T tmp; std::memcpy(&tmp, bytes, sizeof(T)); - *n = bswap(tmp); + *n = byteswap(tmp); #endif #if !SPIDER_BIG_ENDIAN && !SPIDER_LITTLE_ENDIAN using U = std::make_unsigned_t; @@ -213,12 +215,12 @@ namespace spider { inline void loadLE(T* n, const u8* bytes) { static_assert(std::is_trivially_copyable::value); #if SPIDER_BIG_ENDIAN - std::memcpy(n, bytes, sizeof(T)); -#endif -#if SPIDER_LITTLE_ENDIAN T tmp; std::memcpy(&tmp, bytes, sizeof(T)); - *n = bswap(tmp); + *n = byteswap(tmp); +#endif +#if SPIDER_LITTLE_ENDIAN + std::memcpy(n, bytes, sizeof(T)); #endif #if !SPIDER_BIG_ENDIAN && !SPIDER_LITTLE_ENDIAN using U = std::make_unsigned_t; diff --git a/src/spider/runtime/util/Terminal.hpp b/src/spider/runtime/util/Terminal.hpp index 108491e..3f183f1 100644 --- a/src/spider/runtime/util/Terminal.hpp +++ b/src/spider/runtime/util/Terminal.hpp @@ -153,7 +153,7 @@ namespace spider { std::string s = oss.str(); // then print - if (s.length() >= size(width)) { + if (s.length() >= isize(width)) { std::cout << s; } else { i32 total_padding = width - s.length();