X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=minsk.c;h=50038f6697ed40d61d3b45865ab11908383ab4cd;hb=HEAD;hp=5e40f644c2ab52ade19a72b3f8ce1518f66b73de;hpb=b330c4e5b5351ded567659f9065bd7ad5610875d;p=minsk.git diff --git a/minsk.c b/minsk.c index 5e40f64..50038f6 100644 --- a/minsk.c +++ b/minsk.c @@ -4,12 +4,6 @@ * (c) 2010 Martin Mares */ -/* - * TODO: - * - debugging/play mode - * - we probably have to disable NOP - */ - /* * Things that are not implemented: * @@ -20,24 +14,42 @@ * reader and puncher, card reader and puncher, magnetic tape unit) */ +#define _GNU_SOURCE +#define UNUSED __attribute__((unused)) +#define NORETURN __attribute__((noreturn)) + +#undef ENABLE_DAEMON_MODE + #include #include #include +#include #include #include #include +#include -static int trace = 3; +static int trace; static int cpu_quota = -1; static int print_quota = -1; +static int english; +static int memblocks = 1; +static void (*error_hook)(char *msg); // Minsk-2 has 37-bit words in sign-magnitude representation (bit 36 = sign) typedef unsigned long long int word; +#define MEM_SIZE 4096 #define WORD_MASK 01777777777777ULL #define SIGN_MASK 01000000000000ULL #define VAL_MASK 00777777777777ULL +typedef struct loc +{ + int block; + int address; +} loc; + static int wsign(word w) { return (w & SIGN_MASK) ? -1 : 1; @@ -49,6 +61,7 @@ static word wabs(word w) } #define WF(w) (wsign(w) < 0 ? '-' : '+'), wabs(w) +#define LF(a) (a.block), (a.address) static long long wtoll(word w) { @@ -147,65 +160,77 @@ static word wfromfloat(double x, int normalized) return w; } -static word mem[4096]; +static word **mem; -static word rd(int addr) +static word rd(loc addr) { - word val = addr ? mem[addr] : 0; + word val = addr.address ? mem[addr.block][addr.address] : 0; if (trace > 2) - printf("\tRD %04o = %c%012llo\n", addr, WF(val)); + printf("\tRD %d:%04o = %c%012llo\n", LF(addr), WF(val)); return val; } -static void wr(int addr, word val) +static void wr(loc addr, word val) { assert(!(val & ~(WORD_MASK))); if (trace > 2) - printf("\tWR %04o = %c%012llo\n", addr, WF(val)); - mem[addr] = val; + printf("\tWR %d:%04o = %c%012llo\n", LF(addr), WF(val)); + mem[addr.block][addr.address] = val; } static int lino; -static void parse_error(char *msg) +NORETURN static void parse_error(char *russian_msg, char *english_msg) { - printf("Ошибка входа (стр. %d): %s\n", lino, msg); - exit(1); + if (error_hook) + error_hook("Parse error"); + + if (english) + printf("Parse error (line %d): %s\n", lino, english_msg); + else + printf("Ошибка входа (стр. %d): %s\n", lino, russian_msg); + exit(0); } static void parse_in(void) { char line[80]; - int addr = 0; + loc addr = { 0, 0 }; while (fgets(line, sizeof(line), stdin)) { lino++; char *eol = strchr(line, '\n'); if (!eol) - parse_error("Строка слишком долгая"); + parse_error("Строка слишком долгая", "Line too long"); *eol = 0; + if (eol > line && eol[-1] == '\r') + *--eol = 0; char *c = line; if (!c[0] || c[0] == ';') continue; + + if (c[0] == '.') + return; + if (c[0] == '@') { c++; - addr = 0; + addr.address = 0; for (int i=0; i<4; i++) { while (*c == ' ') c++; if (*c >= '0' && *c <= '7') - addr = 8*addr + *c++ - '0'; + addr.address = 8*addr.address + *c++ - '0'; else - parse_error("Плохая цифра"); + parse_error("Плохая цифра", "Invalid number"); } while (*c == ' ') c++; if (*c) - parse_error("Адрес слишком долгий"); + parse_error("Адрес слишком долгий", "Address too long"); continue; } @@ -213,7 +238,7 @@ static void parse_in(void) if (*c == '-') w = 1; else if (*c != '+') - parse_error("Плохой знак"); + parse_error("Плохой знак", "Invalid sign"); c++; for (int i=0; i<12; i++) { @@ -222,14 +247,14 @@ static void parse_in(void) if (*c >= '0' && *c <= '7') w = 8*w + *c++ - '0'; else - parse_error("Плохая цифра"); + parse_error("Плохая цифра", "Invalid number"); } while (*c == ' ') c++; if (*c) - parse_error("Номер слишком долгий"); - wr(addr++, w); - addr &= 07777; + parse_error("Номер слишком долгий", "Number too long"); + wr(addr, w); + addr.address = (addr.address+1) & 07777; } } @@ -238,28 +263,39 @@ static word r1, r2, current_ins; static int ip = 00050; // Standard program start location static int prev_ip; -static void stop(char *reason) +NORETURN static void stop(char *russian_reason, char *english_reason) { - printf("Машина остановлена -- %s\n", reason); - printf("СчАК:%04o См:%c%012llo Р1:%c%012llo Р2:%c%012llo\n", prev_ip, WF(acc), WF(r1), WF(r2)); + if (error_hook) + error_hook(english_reason); + + if (english) + { + printf("System stopped -- %s\n", english_reason); + printf("IP:%04o ACC:%c%012llo R1:%c%012llo R2:%c%012llo\n", prev_ip, WF(acc), WF(r1), WF(r2)); + } + else + { + printf("Машина остановлена -- %s\n", russian_reason); + printf("СчАК:%04o См:%c%012llo Р1:%c%012llo Р2:%c%012llo\n", prev_ip, WF(acc), WF(r1), WF(r2)); + } exit(0); } -static void over(void) +NORETURN static void over(void) { - stop("Аварийный останов"); + stop("Аварийный останов", "Overflow"); } -static void notimp(void) +NORETURN static void notimp(void) { acc = current_ins; - stop("Устройство разбитое"); + stop("Устройство разбитое", "Not implemented"); } -static void noins(void) +NORETURN static void noins(void) { acc = current_ins; - stop("Эту команду не знаю"); + stop("Эту команду не знаю", "Illegal instruction"); } static uint16_t linebuf[128]; @@ -297,7 +333,7 @@ static void print_line(int r) if (r & 4) { if (print_quota > 0 && !--print_quota) - stop("Бумага дошла - нужно ехать в Сибирь про новую"); + stop("Бумага дошла - нужно ехать в Сибирь про новую", "Out of paper"); for (int i=0; i<128; i++) { int ch = linebuf[i]; @@ -327,7 +363,7 @@ static void print_line(int r) fflush(stdout); } -static void print_ins(int x, int y) +static void print_ins(int x, loc y) { word yy = rd(y); int pos = x & 0177; @@ -358,15 +394,13 @@ static void print_ins(int x, int y) eat = 1; break; case 4: // One Russian symbol - bit = 6; - fmt = "r"; + fmt = "xr"; break; case 5: // Russian text fmt = "xrrrrrr"; break; case 6: // One Latin symbol - bit = 6; - fmt = "l"; + fmt = "xl"; break; default: // Latin text fmt = "xllllll"; @@ -423,7 +457,7 @@ static void print_ins(int x, int y) linebuf[pos] = ch; pos = (pos+1) & 0177; } - assert(!bit); + assert(bit >= 0); } static void run(void) @@ -432,38 +466,39 @@ static void run(void) { r2 = acc; prev_ip = ip; - word w = mem[ip]; + word w = mem[0][ip]; current_ins = w; int op = (w >> 30) & 0177; // Operation code - int ax = (w >> 28) & 3; // Address extensions not supported + int ax = (w >> 28) & 3; // Address extensions supported in Minsk-22 mode int ix = (w >> 24) & 15; // Indexing - int x = (w >> 12) & 07777; // Operands (original form) - int y = w & 07777; - int xi=x, yi=y; // (indexed form) + loc x = { ax >> 1, (w >> 12) & 07777 }; // Operands (original form) + loc y = { ax & 1, w & 07777 }; + loc xi=x, yi=y; // (indexed form) if (trace) - printf("@%04o %c%02o %02o %04o %04o\n", + printf("@%04o %c%02o %02o %d:%04o %d:%04o\n", ip, (w & SIGN_MASK) ? '-' : '+', (int)((w >> 30) & 077), (int)((w >> 24) & 077), - x, - y); + LF(x), + LF(y)); if (ix) { if (op != 0120) { - word i = rd(ix); - xi = (xi + (int)((i >> 12) & 07777)) & 07777; - yi = (yi + (int)(i & 07777)) & 07777; + loc iaddr = { 0, ix }; + word i = rd(iaddr); + xi.address = (xi.address + (int)((i >> 12) & 07777)) & 07777; + yi.address = (yi.address + (int)(i & 07777)) & 07777; if (trace > 2) - printf("\tIndexing -> %04o %04o\n", xi, yi); + printf("\tIndexing -> %d:%04o %d:%04o\n", LF(xi), LF(yi)); } } ip = (ip+1) & 07777; if (cpu_quota > 0 && !--cpu_quota) - stop("Тайм-аут"); + stop("Тайм-аут", "CPU quota exceeded"); /* Arithmetic operations */ @@ -514,7 +549,7 @@ static void run(void) astore(wfromfloat(f, 0)); } - if (ax) + if (ax && memblocks == 1) // Reject address extensions if we only have 1 memory block op = -1; switch (op) { @@ -606,7 +641,7 @@ static void run(void) case 0100: // Halt r1 = rd(x); acc = rd(y); - stop("Останов машины"); + stop("Останов машины", "Halted"); case 0103: // I/O magtape notimp(); case 0104: // Disable rounding @@ -641,7 +676,8 @@ static void run(void) case 0120: // Loop if (!ix) noins(); - a = r1 = rd(ix); + loc iaddr = { 0, ix }; + a = r1 = rd(iaddr); aa = (a >> 24) & 017777; if (!aa) break; @@ -649,36 +685,36 @@ static void run(void) acc = ((aa-1) << 24) | (((((a >> 12) & 07777) + (b >> 12) & 07777) & 07777) << 12) | (((a & 07777) + (b & 07777)) & 07777); - wr(ix, acc); - ip = x; + wr(iaddr, acc); + ip = x.address; break; case 0130: // Jump wr(y, r2); - ip = x; + ip = x.address; break; case 0131: // Jump to subroutine - wr(y, acc = ((030ULL << 30) | ((ip & 07777ULL) << 12))); - ip = x; + wr(y, acc = ((0130ULL << 30) | ((ip & 07777ULL) << 12))); + ip = x.address; break; case 0132: // Jump if positive if (wsign(r2) >= 0) - ip = x; + ip = x.address; else - ip = y; + ip = y.address; break; case 0133: // Jump if overflow // Since we always trap on overflow, this instruction always jumps to the 1st address - ip = x; + ip = x.address; break; case 0134: // Jump if zero if (!wabs(r2)) - ip = y; + ip = y.address; else - ip = x; + ip = x.address; break; case 0135: // Jump if key pressed // No keys are ever pressed, so always jump to 2nd - ip = y; + ip = y.address; break; case 0136: // Interrupt masking notimp(); @@ -691,7 +727,7 @@ static void run(void) case 0160 ... 0161: // I/O notimp(); case 0162: // Printing - print_ins(x, y); + print_ins(x.address, y); break; case 0163: // I/O notimp(); @@ -746,7 +782,8 @@ static void run(void) if (!wabs(a)) { wr(yi, 0); - wr((yi+1) & 07777, 0); + loc yinc = { yi.block, (yi.address+1) & 07777 }; + wr(yinc, 0); acc = 0; } else @@ -761,7 +798,8 @@ static void run(void) } acc |= a; wr(yi, acc); - wr((yi+1) & 07777, i); + loc yinc = { yi.block, (yi.address+1) & 07777 }; + wr(yinc, i); } break; case 0176: // Population count @@ -783,9 +821,564 @@ static void run(void) } } -int main(void) +NORETURN static void die(char *msg) { + fprintf(stderr, "minsk: %s\n", msg); + exit(1); +} + +/*** Daemon interface ***/ + +#ifdef ENABLE_DAEMON_MODE + +/* + * The daemon mode was a quick hack for the Po drate contest. + * Most parameters are hard-wired. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if 0 +#define DTRACE(msg, args...) fprintf(stderr, msg "\n", ##args) +#define DLOG(msg, args...) fprintf(stderr, msg "\n", ##args) +#else +#define DTRACE(msg, args...) do { } while(0) +#define DLOG(msg, args...) syslog(LOG_INFO, msg, ##args) +#endif + +#define MAX_CONNECTIONS 50 // Per daemon +#define MAX_CONNS_PER_IP 1 // Per IP +#define MAX_TRACKERS 200 // IP address trackers +#define TBF_MAX 5 // Max number of tokens in the bucket +#define TBF_REFILL_PER_SEC 0.2 // Bucket refill rate (buckets/sec) + +#define PID_FILE "/var/run/pd-minsk.pid" +#define UID 124 +#define GID 125 + +static char **spt_argv; +static char *spt_start, *spt_end; + +static void setproctitle_init(int argc, char **argv) +{ + int i, len; + char **env, **oldenv, *t; + + spt_argv = argv; + + /* Create a backup copy of environment */ + oldenv = __environ; + len = 0; + for (i=0; oldenv[i]; i++) + len += strlen(oldenv[i]) + 1; + __environ = env = malloc(sizeof(char *)*(i+1)); + t = malloc(len); + if (!__environ || !t) + die("malloc failed"); + for (i=0; oldenv[i]; i++) + { + env[i] = t; + len = strlen(oldenv[i]) + 1; + memcpy(t, oldenv[i], len); + t += len; + } + env[i] = NULL; + + /* Scan for consecutive free space */ + spt_start = spt_end = argv[0]; + for (i=0; i spt_start) + { + n = vsnprintf(buf, sizeof(buf), msg, args); + if (n >= (int) sizeof(buf) || n < 0) + sprintf(buf, ""); + n = spt_end - spt_start; + strncpy(spt_start, buf, n); + spt_start[n] = 0; + spt_argv[0] = spt_start; + spt_argv[1] = NULL; + } + va_end(args); +} + +static void sigchld_handler(int sig UNUSED) +{ +} + +static void sigalrm_handler(int sig UNUSED) +{ + const char err[] = "--- Timed out. Time machine disconnected. ---\n"; + write(1, err, sizeof(err)); + DLOG("Connection timed out"); + exit(0); +} + +static void child_error_hook(char *err) +{ + DLOG("Stopped: %s", err); +} + +static void child(int sk2) +{ + dup2(sk2, 0); + dup2(sk2, 1); + close(sk2); + + struct sigaction sact = { + .sa_handler = sigalrm_handler, + }; + if (sigaction(SIGALRM, &sact, NULL) < 0) + die("sigaction: %m"); + + // Set up limits + alarm(60); + cpu_quota = 100000; + print_quota = 100; + + const char welcome[] = "+++ Welcome to our computer museum. +++\n+++ Our time machine will connect you to one of our exhibits. +++\n\n"; + write(1, welcome, sizeof(welcome)); + + error_hook = child_error_hook; parse_in(); run(); + fflush(stdout); + DTRACE("Finished"); +} + +struct conn { + pid_t pid; + struct in_addr addr; + struct tracker *tracker; +}; + +static struct conn connections[MAX_CONNECTIONS]; + +static struct conn *get_conn(struct in_addr *a) +{ + for (int i=0; ipid) + { + memcpy(&c->addr, a, sizeof(struct in_addr)); + return c; + } + } + return NULL; +} + +static struct conn *pid_to_conn(pid_t pid) +{ + for (int i=0; ipid == pid) + return c; + } + return NULL; +} + +static void put_conn(struct conn *c) +{ + c->pid = 0; + c->tracker = NULL; +} + +struct tracker { + struct in_addr addr; + int active_conns; + time_t last_access; + double tokens; +}; + +static struct tracker trackers[MAX_TRACKERS]; + +static int get_tracker(struct conn *c) +{ + struct tracker *t; + time_t now = time(NULL); + int i; + + for (i=0; iaddr, &c->addr, sizeof(struct in_addr))) + break; + } + if (i < MAX_TRACKERS) + { + if (now > t->last_access) + { + t->tokens += (now - t->last_access) * (double) TBF_REFILL_PER_SEC; + t->last_access = now; + if (t->tokens > TBF_MAX) + t->tokens = TBF_MAX; + } + DTRACE("TBF: Using tracker %d (%.3f tokens)", i, t->tokens); + } + else + { + int min_i = -1; + for (int i=0; iactive_conns && (min_i < 0 || t->last_access < trackers[min_i].last_access)) + min_i = i; + } + if (min_i < 0) + { + DLOG("TBF: Out of trackers!"); + return 0; + } + t = &trackers[min_i]; + if (t->last_access) + DTRACE("TBF: Recycling tracker %d", min_i); + else + DTRACE("TBF: Creating tracker %d", min_i); + memset(t, 0, sizeof(*t)); + t->addr = c->addr; + t->last_access = now; + t->tokens = TBF_MAX; + } + + if (t->active_conns >= MAX_CONNS_PER_IP) + { + DTRACE("TBF: Too many conns per IP"); + return 0; + } + + if (t->tokens >= 0.999) + { + t->tokens -= 1; + t->active_conns++; + c->tracker = t; + DTRACE("TBF: Passed (%d conns)", t->active_conns); + return 1; + } + else + { + DTRACE("TBF: Failed"); + t->tokens = 0; + return 0; + } +} + +static void put_tracker(struct conn *c) +{ + struct tracker *t = c->tracker; + if (!t) + { + DLOG("put_tracker: no tracker?"); + sleep(5); + return; + } + if (t->active_conns <= 0) + { + DLOG("put_tracker: no counter?"); + sleep(5); + return; + } + t->active_conns--; + DTRACE("TBF: Put tracker (%d conns remain)", t->active_conns); +} + +static void run_as_daemon(int do_fork) +{ + int sk = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); + if (sk < 0) + die("socket: %m"); + + int one = 1; + if (setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0) + die("setsockopt: %m"); + + struct sockaddr_in sa = { + .sin_family = AF_INET, + .sin_port = ntohs(1969), + .sin_addr.s_addr = INADDR_ANY, + }; + if (bind(sk, (struct sockaddr *) &sa, sizeof(sa)) < 0) + die("bind: %m"); + if (listen(sk, 128) < 0) + die("listen: %m"); + // if (fcntl(sk, F_SETFL, O_NONBLOCK) < 0) + // die("fcntl: %m"); + + if (do_fork) + { + pid_t pid = fork(); + if (pid < 0) + die("fork: %m"); + if (pid) + { + FILE *f = fopen(PID_FILE, "w"); + if (f) + { + fprintf(f, "%d\n", pid); + fclose(f); + } + exit(0); + } + + chdir("/"); + setresgid(GID, GID, GID); + setresuid(UID, UID, UID); + setsid(); + } + + struct sigaction sact = { + .sa_handler = sigchld_handler, + .sa_flags = SA_RESTART, + }; + if (sigaction(SIGCHLD, &sact, NULL) < 0) + die("sigaction: %m"); + + DLOG("Daemon ready"); + setproctitle("minsk: Listening"); + openlog("minsk", LOG_PID, LOG_LOCAL7); + + for (;;) + { + struct pollfd pfd[1] = { + { .fd = sk, .events = POLLIN }, + }; + + int nfds = poll(pfd, 1, 60000); + if (nfds < 0 && errno != EINTR) + { + DLOG("poll: %m"); + sleep(5); + continue; + } + + int status; + pid_t pid; + while ((pid = waitpid(-1, &status, WNOHANG)) > 0) + { + if (!WIFEXITED(status) || WEXITSTATUS(status)) + DLOG("Process %d exited with strange status %x", pid, status); + + struct conn *conn = pid_to_conn(pid); + if (conn) + { + DTRACE("Connection with PID %d exited", pid); + put_tracker(conn); + put_conn(conn); + } + else + DTRACE("PID %d exited, matching no connection", pid); + } + + if (!(pfd[0].revents & POLLIN)) + continue; + + socklen_t salen = sizeof(sa); + int sk2 = accept(sk, (struct sockaddr *) &sa, &salen); + if (sk2 < 0) + { + if (errno != EINTR) + { + DLOG("accept: %m"); + sleep(5); + } + continue; + } + DTRACE("Got connection: fd=%d", sk2); + + struct conn *conn = get_conn(&sa.sin_addr); + const char *reason = NULL; + if (conn) + { + if (!get_tracker(conn)) + { + DLOG("Connection from %s dropped: Throttling", inet_ntoa(sa.sin_addr)); + put_conn(conn); + conn = NULL; + reason = "--- Sorry, but you are sending too many requests. Please slow down. ---\n"; + } + } + else + { + DLOG("Connection from %s dropped: Too many connections", inet_ntoa(sa.sin_addr)); + reason = "--- Sorry, maximum number of connections exceeded. Please come later. ---\n"; + } + + pid = fork(); + if (pid < 0) + { + DLOG("fork failed: %m"); + close(sk2); + continue; + } + if (!pid) + { + close(sk); + if (conn) + { + DLOG("Accepted connection from %s", inet_ntoa(sa.sin_addr)); + setproctitle("minsk: %s", inet_ntoa(sa.sin_addr)); + child(sk2); + } + else + { + DLOG("Sending error message to %s", inet_ntoa(sa.sin_addr)); + setproctitle("minsk: %s ERR", inet_ntoa(sa.sin_addr)); + write(sk2, reason, strlen(reason)); + } + exit(0); + } + + DTRACE("Created process %d", pid); + if (conn) + conn->pid = pid; + close(sk2); + } +} + +#else + +static void run_as_daemon(int do_fork UNUSED) +{ + die("Daemon mode not supported in this version, need to recompile."); +} + +static void setproctitle_init(int argc UNUSED, char **argv UNUSED) +{ +} + +#endif + +static void init_memory(int set_password) +{ + mem = malloc(memblocks * sizeof(word *)); + for (int i=0; i