X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fvfpu.cpp;h=2c6d7038c1415528f8c5b36ebbaf0f006f52158d;hp=58725f738167dc5387a2d5f60603c4f427d3997c;hb=c0f947a6ce10a329eec81e4df820ac52f7ab371f;hpb=79d61ba24ac2d29cea6e7f1fee2f83705c5fb4ac

diff --git a/src/vfpu.cpp b/src/vfpu.cpp
index 58725f7..2c6d703 100644
--- a/src/vfpu.cpp
+++ b/src/vfpu.cpp
@@ -15,12 +15,14 @@
 #include <sstream>
 #include <iomanip>
 
+#include "common.h"
+
 using namespace std;
 
 namespace VFPU
 {
 
-static const char g_fpu[] = "../vhdl/tb_fpu";
+static const char g_fpu[] = "vfpu";
 
 static bool g_running = false;
 static int g_fpu_socket[2] = {-1,-1};
@@ -51,15 +53,16 @@ int Start()
 		// Remap stdio to the socket
 		dup2(g_fpu_socket[0],fileno(stdin));
 		dup2(g_fpu_socket[0],fileno(stdout));
-		dup2(open("/dev/null", O_APPEND), fileno(stderr)); //LALALA I AM NOT LISTENING TO YOUR STUPID ERRORS GHDL
 		
 		// Unbuffer things; buffers are a pain
 		setbuf(stdin, NULL); setbuf(stdout, NULL); setbuf(stderr, NULL);
 
-		//fprintf(stderr, "Goodbye!\n");
+		Debug("Child about to suppress stderr and exec vfpu");
+		dup2(open("/dev/null", O_APPEND), fileno(stderr)); //LALALA I AM NOT LISTENING TO YOUR STUPID ERRORS GHDL
 		execl(g_fpu, g_fpu,NULL);
-		fprintf(stderr, "Uh oh! %s\n", strerror(errno)); // We will never see this if something goes wrong... oh dear
-		exit(errno); // Child exits here.
+		int err = errno; // Because errno will be set again by the next system call
+		Fatal("Uh oh! %s\n", strerror(err)); // We will never see this if something goes wrong... oh dear
+		exit(err); // Child exits here.
 	}
 
 	// Parent branch
@@ -84,12 +87,12 @@ int Halt()
 	return 0;
 }
 
-float Exec(float opa, float opb, Opcode op)
+float Exec(float opa, float opb, Opcode op, Rmode rmode)
 {
 	unsigned a; memcpy(&a, &opa, sizeof(float));
 	unsigned b; memcpy(&b, &opb, sizeof(float));
 	
-	unsigned r = (unsigned)(Exec(Register(a), Register(b), op).to_ulong());
+	unsigned r = (unsigned)(Exec(Register(a), Register(b), op, rmode).to_ulong());
 	float result; memcpy(&result, &r, sizeof(float));
 	return result;
 }
@@ -97,25 +100,25 @@ float Exec(float opa, float opb, Opcode op)
 /**
  * Tell the VFPU to execute an instruction, wait for it to finish, return the result
  * TODO: Make this not mix C++ and C so badly?
+ * TODO: It will still only work for magic 32 bit FPU
  */
-Register Exec(const Register & a, const Register &  b, Opcode op)
+Register Exec(const Register & a, const Register &  b, Opcode op, Rmode rmode)
 {
 	assert(g_running);
 		
 	stringstream s;
-	s << hex << a.to_ullong() << "\n" << b.to_ullong() << "\n" << setw(3) << setfill('0') << op << "\n";
+	s << hex << setw(8) << setfill('0') << a.to_ullong() << "\n" << b.to_ullong() << "\n" << setw(3) << op <<"\n" << setw(2) << rmode << "\n\n";
 	string str(s.str());
-	//fprintf(stderr, "Writing:\n%s\n", str.c_str());
+	//Debug("Writing: %s", str.c_str());
 
 	// So we used C++ streams to make our C string...
 	assert(write(g_fpu_socket[1], str.c_str(), str.size()) == (int)str.size());
-	//fprintf(stderr, "Wrote!\n");
 
 	char buffer[BUFSIZ]; 
 	int len = read(g_fpu_socket[1], buffer, sizeof(buffer));
 	//assert(len == 9);
 	buffer[--len] = '\0'; // Get rid of newline
-	//fprintf(stderr, "Read!\n");
+	//Debug("Read: %s", buffer);
 	
 	Register result(0);
 	for (int i = 0; i < len/2; ++i)
@@ -124,6 +127,10 @@ Register Exec(const Register & a, const Register &  b, Opcode op)
 		sscanf(buffer+2*i, "%02x", &byte);
 		result |= (byte << 8*(len/2-i-1));
 	}
+	
+	stringstream s2;
+	s2 << hex << result.to_ullong();
+	//Debug("Result is: %s", s2.str().c_str());
 	return result;
 }