Merge pull request #412 from whitequark/wasm

Add WebAssembly support
trabucayre · Dec 24, 2023 · a3745bc · a3745bc
2 parents a38efe9 + 8c6c0ee
commit a3745bc
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/gowin.cpp b/src/gowin.cpp
@@ -231,7 +231,7 @@ bool Gowin::send_command(uint8_t cmd)
 #include <libkern/OSByteOrder.h>
 #define le32toh(x) OSSwapLittleToHostInt32(x)
 #define htole32(x) OSSwapHostToLittleInt32(x)
-#elif (defined(_WIN16) || defined(_WIN32) || defined(_WIN64)) || defined(__WINDOWS__)
+#elif (defined(_WIN16) || defined(_WIN32) || defined(_WIN64)) || defined(__WINDOWS__) || defined(__wasm__)
 	#if BYTE_ORDER == LITTLE_ENDIAN
 		#if defined(_MSC_VER)
 			#include <stdlib.h>

diff --git a/src/lattice.cpp b/src/lattice.cpp
@@ -1048,7 +1048,7 @@ void Lattice::displayReadReg(uint64_t dev)
 	uint8_t err;
 	printf("displayReadReg\n");
 	if (dev & 1<<0) printf("\tTRAN Mode\n");
-	printf("\tConfig Target Selection : %lx\n", (dev >> 1) & 0x07);
+	printf("\tConfig Target Selection : %llx\n", (dev >> 1) & 0x07);
 	if (dev & 1<<4) printf("\tJTAG Active\n");
 	if (dev & 1<<5) printf("\tPWD Protect\n");
 	if (dev & 1<<6) printf("\tOTP\n");

diff --git a/src/xilinx.cpp b/src/xilinx.cpp
@@ -385,7 +385,7 @@ Xilinx::Xilinx(Jtag *jtag, const std::string &filename,
 	if (read_dna) {
 		if (_fpga_family == ARTIX_FAMILY || _fpga_family == KINTEXUS_FAMILY) {
 			uint64_t dna = Xilinx::fuse_dna_read();
-			printf("{\"dna\": \"0x%016lx\"}\n", dna);
+			printf("{\"dna\": \"0x%016llx\"}\n", dna);
 		} else {
 			throw std::runtime_error("Error: read_xadc only supported for Artix 7");
 		}