Commit 64eed60d authored by Martin Ruckert's avatar Martin Ruckert
Browse files

merging mmixvd and mmixide

parent 1dd85e7e
#ifndef LIBCONFIG_H
#define LIBCONFIG_H
/* This tis the libconfig.h file for MMIX IDE rename to libconfig.h */
#ifdef WIN32
#pragma warning(disable : 4996)
#endif
#endif
/* define this if you need a local copy of mem_tetra ll */
#define MMIX_LOCAL_LL /* mem_tetra *ll; current place in the simulated memory */
......@@ -27,18 +27,16 @@
#define MMIX_STORE_DVTC(virt,phys) store_data_translation(&(virt),&(phys))
#ifdef WIN32
#define MMIX_DELAY(ms,d) d = vmb_wait_for_event_timed(&vmb,ms)
#define MMIX_DELAY(ms,d) ((d) = wait_time(ms))
#else
#define MMIX_DELAY(ms,d) (usleep(1000*(ms)), d=(ms))
#endif
/* define this to check for external asynchronous ineterrupts*/
#define MMIX_GET_INTERRUPT \
if (vmb_get_interrupt(&vmb,&new_Q.h,&new_Q.l)==1) \
{ g[rQ].h |= new_Q.h; g[rQ].l |= new_Q.l; }
#define MMIX_GET_INTERRUPT get_interrupt(&new_Q)
/* this code is executed when MMIX enters the handler for Ctrl-C */
#define MMIX_CTRL_HANDLER vmb_cancel_wait_for_event(&vmb); show_operating_system=true;
#define MMIX_CTRL_HANDLER (cancel_wait(), show_operating_system=true)
/* this code defines additional command line options */
......@@ -91,7 +89,7 @@ extern int mmix_fputc(int c, FILE *f);
#define MMIX_ERROR(f,m) fprintf(stderr,f,m)
/* define this if you need the tetra inside the mem_node */
#define MMIX_MEM_TET /* tetra tet; the tetrabyte of simulated memory */
#undef MMIX_MEM_TET /* tetra tet; the tetrabyte of simulated memory */
/* these are the functions for the instructions not implemented in the basic mmix simulator */
#define MMIX_WRITE_DCACHE() write_all_data_cache()
......
#include "vmb.h"
#include "address.h"
#include "mmix-bus.h"
extern device_info vmb;
extern void win32_log(char *msg);
\ No newline at end of file
#include "../../vmbmmixlib/address.h"
#include "../../vmbmmixlib/mmix-bus.h"
extern void win32_log(char *msg);
......@@ -1848,13 +1848,6 @@ else
}
@z
We add parentheses here to make sure & comes before == and get rid of a compiler warning.
@x
if (g[rU].l==0)@+{@+g[rU].h++;@+if (g[rU].h&0x7fff==0) g[rU].h-=0x8000;@+}
@y
if (g[rU].l==0)@+{@+g[rU].h++;@+if ((g[rU].h&0x7fff)==0) g[rU].h-=0x8000;@+}
@z
@x
if (g[rI].l<=info[op].oops && g[rI].l && g[rI].h==0) tracing=breakpoint=true;
@y
......
......@@ -24,6 +24,8 @@
>
<Tool
Name="VCPreBuildEventTool"
Description="copy boilerplate include file"
CommandLine="copy $(InputDir)mmixware\boilerplate.w $(InputDir)boilerplate.w"
/>
<Tool
Name="VCCustomBuildTool"
......@@ -88,6 +90,8 @@
>
<Tool
Name="VCPreBuildEventTool"
Description="copy boilerplate include file"
CommandLine="copy $(InputDir)mmixware\boilerplate.w $(InputDir)boilerplate.w"
/>
<Tool
Name="VCCustomBuildTool"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment