Commit MetaInfo

Revision69116cfff2e915ad9d2f95268432fe4bd0e007d9 (tree)
Time2019-05-09 03:47:18
Authorsparky4 <sparky4@cock...>
Commitersparky4

Log Message

got bcexmm to compile again. i got alot of work todo with this section of the code but the core is important af

Change Summary

Incremental Difference

Binary files a/JOYTEST.E and /dev/null differ
Binary files a/OPLTEST.E and /dev/null differ
Binary files a/bcexmm.dsk and b/bcexmm.dsk differ
Binary files a/bcexmm.prj and b/bcexmm.prj differ
--- a/makefile
+++ b/makefile
@@ -55,7 +55,7 @@ DOSLIBMAKEALL=./buildall.sh build all
5555 to_os_path=/=\
5656 REMOVECOMMAND=del
5757 COPYCOMMAND=copy /y
58-MOVECOMMAND=move
58+MOVECOMMAND=move /q
5959 DIRSEP=\
6060 OBJ=obj
6161 DUMP=type
@@ -495,7 +495,6 @@ clean: .symbolic
495495 @if not exist $(DOSLIBDIR)/buildall.sh wmake -s -h initlibs
496496 @wmake -s -h initscript
497497 @for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
498- @wmake -s -h exe2e
499498 !ifdef __LINUX__
500499 @if exist *.LIB $(REMOVECOMMAND) *.LIB
501500 @. src/util/bcexmm.sh
@@ -508,6 +507,7 @@ clean: .symbolic
508507 !else
509508 @if exist *.o $(REMOVECOMMAND) *.o
510509 !endif
510+ @wmake -s -h exe2e
511511 @if exist *.$(OBJ) $(REMOVECOMMAND) *.$(OBJ)
512512 @if exist *.bco $(REMOVECOMMAND) *.bco
513513 @if exist *.BCO $(REMOVECOMMAND) *.BCO
@@ -586,11 +586,11 @@ comq: .symbolic
586586 @wmake -s -h e2exe
587587
588588 exe2e: .symbolic
589- @if exist *.exe $(MOVECOMMAND) *.exe *.e
589+ @if exist *.exe $(MOVECOMMAND) *.exe $(SRC)
590590 #@for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
591591
592592 e2exe: .symbolic
593- @if exist *.e $(MOVECOMMAND) *.e *.exe
593+ @if exist $(SRC)/*.exe $(MOVECOMMAND) $(SRC)/*.exe .
594594
595595 www: .symbolic
596596 @if exist 16.exe @wmake -s -h wwwdo
Binary files /dev/null and b/src/bcexmm.exe differ
--- a/src/exmmtest.h
+++ b/src/exmmtest.h
@@ -51,7 +51,7 @@
5151 #define NOVID
5252 #endif
5353 #ifdef __WATCOMC__
54-//#define NOVID
54+#define NOVID
5555 //#define SCROLLLOAD
5656 #endif
5757
--- a/src/lib/16_head.c
+++ b/src/lib/16_head.c
@@ -224,14 +224,19 @@ void regidump()
224224 {
225225 //GENERAL PURPOSE
226226 unsigned short _ax,_bx,_cx,_dx;
227+#ifndef __BORLANDC__
227228 unsigned short _cflag;
229+#endif
228230 unsigned char _al,_ah,_bl,_bh,_cl,_ch,_dl,_dh;
229231
230232 unsigned short _bp,_si,_di,_sp;
231233
232- unsigned short _cs,_ds,_es,_ss; //SEGMENT
234+ unsigned short _cs_,_ds_,_es_,_ss_; //SEGMENT
233235 // unsigned short _ip; //SPECIAL PURPOSE
234- _ax=_bx=_cx=_dx=_si=_di=_bp=_sp=_cs=_ds=_es=_ss=_cflag=0;
236+ _ax=_bx=_cx=_dx=_si=_di=_bp=_sp=_cs_=_ds_=_es_=_ss_=0;
237+#ifndef __BORLANDC__
238+ _cflag=0;
239+#endif
235240 _ah=_al=_bh=_bl=_ch=_cl=_dh=_dl=0;
236241
237242 #ifndef REGIDUMP_USE_CAPS
@@ -255,6 +260,14 @@ void regidump()
255260 mov _if,if
256261 mov _df,df
257262 mov _of,of*/
263+ mov _ah,ah
264+ mov _al,al
265+ mov _bh,bh
266+ mov _bl,bl
267+ mov _ch,ch
268+ mov _cl,cl
269+ mov _dh,dh
270+ mov _dl,dl
258271 }
259272 #else
260273 _ax=_AX;
@@ -274,15 +287,17 @@ _cl=_CL;
274287 _dh=_DH;
275288 _dl=_DL;
276289 #endif
290+#ifndef __BORLANDC__
277291 _cflag=_CFLAG;
292+#endif
278293 __asm {
279294 mov _bp,bp
280295 mov _sp,sp
281296
282- mov _cs,cs
283- mov _ds,ds
284- mov _es,es
285- mov _ss,ss
297+ mov _cs_,cs
298+ mov _ds_,ds
299+ mov _es_,es
300+ mov _ss_,ss
286301 }
287302 // printf("integer values: ax=%04d bx=%04d cx=%04d dx=%04d\n", a, b, c, d);
288303 // printf("unsigned values:ax=%04u bx=%04u cx=%04u dx=%04u\n", a, b, c, d);
@@ -303,14 +318,16 @@ _dl=_DL;
303318
304319 printf("segment:\n");
305320 #ifndef REGIDUMP_HEX
306- printf(" cs=%04u\n ds=%04u\n es=%04u\n ss=%04u\n", _cs, _ds, _es, _ss);
321+ //printf(" cs=%04u\n ds=%04u\n es=%04u\n ss=%04u\n", _cs_, _ds, _es_, _ss_);
322+ printf(" cs=%04u\n", _cs_); printf(" ds=%04u\n", _ds_); printf(" es=%04u\n", _es_); printf(" ss=%04u\n", _ss_);
307323 #else
308- printf(" cs=%04x\n ds=%04x\n es=%04x\n ss=%04x\n", _cs, _ds, _es, _ss);
324+ //printf(" cs=%04x\n ds=%04x\n es=%04x\n ss=%04x\n", _cs_, _ds_, _es_, _ss_);
325+ printf(" cs=%04x\n", _cs_); printf(" ds=%04x\n", _ds_); printf(" es=%04x\n", _es_); printf(" ss=%04x\n", _ss_);
309326 #endif
310327 printf(" ---------------------------------------\n");
311328
312329
313-
330+#ifndef __BORLANDC__
314331 printf("cflags:\n");
315332 /* printf(" ip=%04u\n\n", _ip);
316333 printf(" cf=%04u\npf=%04u\naf=%04u\nzf=%04u\nsf=%04u\ntf=%04u\nif=%04u\ndf=%04u\nof=%04u\n", _cf, _pf, _af, _zf, _sf, _tf, _if, _df, _of);
@@ -325,6 +342,7 @@ _dl=_DL;
325342 // printf(" ip=%04x\n\n", _IP);
326343 // printf(" cf=%04x\npf=%04x\naf=%04x\nzf=%04x\nsf=%04x\ntf=%04x\nif=%04x\ndf=%04x\nof=%04x\n", _CF, _PF, _AF, _ZF, _SF, _TF, _IF, _DF, _OF);
327344 printf("cflag: %016x\n",(_cflag));
345+ printf(" ahl=%016x", _al|(_ah<<4));
328346 #endif
329347 printf("testing\n");
330348 // printf("dx: "NIBBLE_TO_BINARY_PATTERN""NIBBLE_TO_BINARY_PATTERN"\n", NIBBLE_TO_BINARY(_dx>>4), NIBBLE_TO_BINARY(_dx));
@@ -332,6 +350,7 @@ _dl=_DL;
332350 printf("dx: "WORD_TO_BINARY_PATTERN"\n", WORD_TO_BINARY(_dx));
333351 printf(" ---------------------------------------\n");
334352 #endif
353+#endif
335354
336355 printf("for more info see\n http://stackoverflow.com/questions/9130349/how-many-registers-are-there-in-8086-8088\n");
337356 printf("================================================================================");
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -1344,8 +1344,8 @@ extern char global_temp_status_text[512];
13441344 extern char global_temp_status_text2[512];
13451345 #endif
13461346 //#ifdef __WATCOMC__
1347-//#define MMSMPANVID
1348-#define MMSMSCANINFO
1347+//++??#define MMSMPANVID
1348+//++++#define MMSMSCANINFO
13491349 //#endif
13501350
13511351 /*
--- a/src/lib/16_tail.h
+++ b/src/lib/16_tail.h
@@ -127,6 +127,8 @@
127127 #define PAL_DATA_REG 0x03C9 /* Color register, data port */
128128 #endif
129129
130+extern char global_temp_status_text[512];
131+
130132 void Shutdown16(global_game_variables_t *gvar),
131133 Startup16(global_game_variables_t *gvar),
132134 StartupCAMMPM (global_game_variables_t *gvar),
--- a/src/util/bcexmm.sh
+++ b/src/util/bcexmm.sh
@@ -1,6 +1,8 @@
11 #!/bin/bash
22 if [ -f "BCEXMM.MAP" ]; then
3- mv BCEXMM.EXE bcexmm.ex0
4- mv bcexmm.ex0 bcexmm.exe
3+ if [ -f "BCEXMM.EXE" ]; then
4+ mv BCEXMM.EXE bcexmm.ex0
5+ mv bcexmm.ex0 bcexmm.exe
6+ fi
57 mv BCEXMM.MAP bcexmm.meh
68 fi
Show on old repository browser