wu-arch/kernels
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simX openfile working

Browse Source
This commit is contained in:
fares
2019-11-18 15:10:29 -05:00
parent dcf9cd3c80
commit 3bc2f449e4
16 changed files with 93315 additions and 120639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
simX/mem.cpp
View File

@@ -7,7 +7,7 @@
#include <string>
#include <vector>
#include <stdlib.h>
#include <pthread.h>
// #include <pthread.h>
#include "include/debug.h"
#include "include/types.h"
@@ -206,35 +206,35 @@ void MemoryUnit::tlbRm(Addr va) {
}
void *Harp::consoleInputThread(void* arg_vp) {
ConsoleMemDevice *arg = (ConsoleMemDevice *)arg_vp;
char c;
while (cin) {
c = cin.get();
pthread_mutex_lock(&arg->cBufLock);
arg->cBuf.push(c);
pthread_mutex_unlock(&arg->cBufLock);
}
cout << "Console input ended. Exiting.\n";
exit(4);
// ConsoleMemDevice *arg = (ConsoleMemDevice *)arg_vp;
// char c;
// while (cin) {
// c = cin.get();
// pthread_mutex_lock(&arg->cBufLock);
// arg->cBuf.push(c);
// pthread_mutex_unlock(&arg->cBufLock);
// }
// cout << "Console input ended. Exiting.\n";
// exit(4);
}
ConsoleMemDevice::ConsoleMemDevice(Size wS, std::ostream &o, Core &core,
bool batch) :
wordSize(wS), output(o), core(core), cBuf()
{
// Create a console input thread if we are running in interactive mode.
if (!batch) {
pthread_t *thread = new pthread_t;
pthread_create(thread, NULL, consoleInputThread, (void*)this);
}
pthread_mutex_init(&cBufLock, NULL);
}
// ConsoleMemDevice::ConsoleMemDevice(Size wS, std::ostream &o, Core &core,
// bool batch) :
// wordSize(wS), output(o), core(core), cBuf()
// {
// // Create a console input thread if we are running in interactive mode.
// if (!batch) {
// pthread_t *thread = new pthread_t;
// pthread_create(thread, NULL, consoleInputThread, (void*)this);
// }
// pthread_mutex_init(&cBufLock, NULL);
// }
void ConsoleMemDevice::poll() {
pthread_mutex_lock(&cBufLock);
if (!cBuf.empty()) core.interrupt(8);
pthread_mutex_unlock(&cBufLock);
}
// void ConsoleMemDevice::poll() {
// pthread_mutex_lock(&cBufLock);
// if (!cBuf.empty()) core.interrupt(8);
// pthread_mutex_unlock(&cBufLock);
// }
Word DiskControllerMemDevice::read(Addr a) {
switch (a/8) {