#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};
* Starts the VFPU
* @returns 0 on success, errno of the failing function on failure
*/
-int Start()
+int Start(const char * vcd_output)
{
assert(!g_running);
// create unix socket pair
// 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");
- 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.
+ 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
+ if (vcd_output != NULL)
+ {
+ string s("--vcd=");
+ s += vcd_output;
+ execl(g_fpu, g_fpu, s.c_str(), NULL);
+ }
+ else
+ {
+ execl(g_fpu, g_fpu,NULL);
+ }
+ 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
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;
}
/**
* 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_ulong() << "\n" << b.to_ulong() << "\n" << setw(1) << op <<"\n" << setw(1) << rmode << "\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)
sscanf(buffer+2*i, "%02x", &byte);
result |= (byte << 8*(len/2-i-1));
}
+
+ stringstream s2;
+ //TODO: Make it compile on non C++11
+ s2 << hex << result.to_ulong();
+ //Debug("Result is: %s", s2.str().c_str());
return result;
}