From: sparky4 Date: Wed, 17 Feb 2016 16:22:53 +0000 (-0600) Subject: getting much closer!!! X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=4c77f2b84c54941f0058bc05dfdcd877261fb60c;p=plz.git getting much closer!!! --- diff --git a/copper.c b/copper.c index 1e0769c..9cb3c39 100755 --- a/copper.c +++ b/copper.c @@ -1,6 +1,5 @@ #include "copper.h" - int far cop_drop; int far cop_plz; int far cop_start; @@ -8,25 +7,17 @@ char far * cop_fadepal; char fadepal[768]; char far *cop_pal; -/* -__asm{ - mov bx,7 - mov ax,1 - mov cx,offset copper1 - mov dx,COPPER_TEXT - int 0fcH - mov bx,7 - mov ax,2 - mov cx,offset copper2 - mov dx,COPPER_TEXT - int 0fcH - mov bx,7 - mov ax,0 - mov cx,offset copper3 - mov dx,COPPER_TEXT - int 0fcH +word dtau[66]; + +int init_copper() +{ + word ccc; + for (ccc = 0; ccc < 65; ccc++) + { + dtau[ccc] = floor(ccc * ccc / 4 * 43 / 128 + 60); + } + return 0; } -}*/ int close_copper() { diff --git a/copper.h b/copper.h index fa737ec..13a745e 100755 --- a/copper.h +++ b/copper.h @@ -1,5 +1,8 @@ #ifndef _COPPER_H_ #define _COPPER_H_ +#include +#include "types.h" + int init_copper(); int close_copper(); #endif diff --git a/copper.o b/copper.o index a774f3f..e815c93 100755 Binary files a/copper.o and b/copper.o differ diff --git a/makefile b/makefile index 0eaad16..c853b80 100755 --- a/makefile +++ b/makefile @@ -89,7 +89,7 @@ tweak.$(OBJ): tweak.h tweak.c asmyt.$(OBJ): asmyt.h asmyt.c wcl $(FLAGS) -c asmyt.c copper.$(OBJ): copper.h copper.c copper.asm - wcl $(AFLAGS) -zcm=tasm -c copper.asm +# wcl $(AFLAGS) -zcm=tasm -c copper.asm wcl $(FLAGS) -c copper.c #tasm compiled... # copper.$(OBJ): copper.h copper.asm diff --git a/plz.o b/plz.o index ed3d2dd..64408d9 100755 Binary files a/plz.o and b/plz.o differ diff --git a/plzpart.map b/plzpart.map index 121a888..7229ff6 100755 --- a/plzpart.map +++ b/plzpart.map @@ -1,10 +1,9 @@ Open Watcom Linker Version 2.0 beta Feb 1 2016 01:01:49 (32-bit) Copyright (c) 2002-2016 The Open Watcom Contributors. All Rights Reserved. Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved. -Created on: 16/02/17 10:14:19 +Created on: 16/02/17 10:22:35 Executable Image: plzpart.exe creating a DOS executable -Error! E2028: init_copper_ is an undefined reference Error! E2028: setplzparas_ is an undefined reference Error! E2028: plzline_ is an undefined reference @@ -16,7 +15,7 @@ Error! E2028: plzline_ is an undefined reference Group Address Size ===== ======= ==== -DGROUP 0104:0000 0000a950 +DGROUP 0393:0000 0000ae30 @@ -28,29 +27,31 @@ Segment Class Group Address Size ======= ===== ===== ======= ==== plzpart_TEXT CODE AUTO 0000:0000 00000020 -copper_TEXT CODE AUTO 0000:0020 00000048 -tweak_TEXT CODE AUTO 0000:0070 0000006d -plz_TEXT CODE AUTO 0000:00e0 00000a30 -asmyt_TEXT CODE AUTO 0000:0b10 00000041 -_TEXT CODE AUTO 0000:0b52 000004c8 -copper13_DATA FAR_DATA AUTO 0102:0000 00000006 -plz13_DATA FAR_DATA AUTO 0102:0010 00000002 -FAR_DATA FAR_DATA AUTO 0103:0002 00000000 -_NULL BEGDATA DGROUP 0104:0000 00000020 -_AFTERNULL BEGDATA DGROUP 0106:0000 00000002 -CONST DATA DGROUP 0106:0002 00000000 -CONST2 DATA DGROUP 0106:0002 00000000 -_DATA DATA DGROUP 0106:0002 00000218 -XIB DATA DGROUP 0127:000a 00000000 -XI DATA DGROUP 0127:000a 00000006 -XIE DATA DGROUP 0128:0000 00000000 -YIB DATA DGROUP 0128:0000 00000000 -YI DATA DGROUP 0128:0000 00000000 -YIE DATA DGROUP 0128:0000 00000000 -STRINGS DATA DGROUP 0128:0000 00000000 -DATA DATA DGROUP 0128:0000 00000000 -_BSS BSS DGROUP 0128:0000 0000270e -STACK STACK DGROUP 0399:0000 00008000 +copper_TEXT CODE AUTO 0000:0020 000000d2 +tweak_TEXT CODE AUTO 0000:0100 0000006d +plz_TEXT CODE AUTO 0000:0170 00000a30 +asmyt_TEXT CODE AUTO 0000:0ba0 00000041 +_TEXT CODE AUTO 0000:0be2 00002d27 +copper13_DATA FAR_DATA AUTO 0391:0000 00000006 +plz13_DATA FAR_DATA AUTO 0391:0010 00000002 +FAR_DATA FAR_DATA AUTO 0392:0002 00000000 +_NULL BEGDATA DGROUP 0393:0000 00000020 +_AFTERNULL BEGDATA DGROUP 0395:0000 00000002 +CONST DATA DGROUP 0395:0002 00000022 +CONST2 DATA DGROUP 0397:0004 00000132 +_DATA DATA DGROUP 03aa:0006 000002f6 +XIB DATA DGROUP 03d9:000c 00000000 +XI DATA DGROUP 03d9:000c 00000018 +XIE DATA DGROUP 03db:0004 00000000 +YIB DATA DGROUP 03db:0004 00000000 +YI DATA DGROUP 03db:0004 00000000 +YIE DATA DGROUP 03db:0004 00000000 +STRINGS DATA DGROUP 03db:0004 00000000 +DATA DATA DGROUP 03db:0004 00000000 +_emu_init_start EMU DGROUP 03db:0004 00000000 +_emu_init_end EMU DGROUP 03db:0004 00000000 +_BSS BSS DGROUP 03dc:0000 00002998 +STACK STACK DGROUP 0676:0000 00008000 +----------------+ @@ -66,120 +67,214 @@ Address Symbol Module: plzpart.o(/dos/z/plz/plzpart.c) 0000:0000 main_ Module: copper.o(/dos/z/plz/copper.c) -0000:0020 close_copper_ -0104:0240 _fadepal -0104:0540* _cop_pal -0104:0544 _cop_fadepal -0102:0000 _cop_plz -0102:0002 _cop_drop -0102:0004 _cop_start +0000:0020 init_copper_ +0000:00aa close_copper_ +0393:0490 _fadepal +0393:0790 _cop_fadepal +0393:0794+ _dtau +0393:0818* _cop_pal +0391:0000 _cop_plz +0391:0002 _cop_drop +0391:0004 _cop_start Module: tweak.o(/dos/z/plz/tweak.c) -0000:0070 tw_opengraph2_ -0000:00b8 tw_setrgbpalette_ +0000:0100 tw_opengraph2_ +0000:0148 tw_setrgbpalette_ Module: plz.o(/dos/z/plz/plz.c) -0000:00e0 plz_ -0000:03a8+ init_plz_ -0104:0022+ _ptau -0104:0122+ _curpal -0104:0124* _timetable -0104:0138+ _ttptr -0104:013a+ _l1 -0104:013c+ _l2 -0104:013e+ _l3 -0104:0140+ _l4 -0104:0142+ _k1 -0104:0144+ _k2 -0104:0146+ _k3 -0104:0148+ _k4 -0104:014a+ _il1 -0104:014c+ _il2 -0104:014e+ _il3 -0104:0150+ _il4 -0104:0152+ _ik1 -0104:0154+ _ik2 -0104:0156+ _ik3 -0104:0158+ _ik4 -0104:015a+ _inittable -0104:0548+ _pals -0102:0010+ _frame_count +0000:0170 plz_ +0000:0438+ init_plz_ +0393:0176+ _ptau +0393:0276+ _curpal +0393:0278* _timetable +0393:028c+ _ttptr +0393:028e+ _l1 +0393:0290+ _l2 +0393:0292+ _l3 +0393:0294+ _l4 +0393:0296+ _k1 +0393:0298+ _k2 +0393:029a+ _k3 +0393:029c+ _k4 +0393:029e+ _il1 +0393:02a0+ _il2 +0393:02a2+ _il3 +0393:02a4+ _il4 +0393:02a6+ _ik1 +0393:02a8+ _ik2 +0393:02aa+ _ik3 +0393:02ac+ _ik4 +0393:02ae+ _inittable +0393:081c+ _pals +0391:0010+ _frame_count Module: asmyt.o(/dos/z/plz/asmyt.c) -0000:0b10 set_plzstart_ +0000:0ba0 set_plzstart_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(stk086.asm) -0000:0b57 __STK -0000:0b77* __STKOVERFLOW_ +0000:0be7 __STK +0000:0c07* __STKOVERFLOW_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cstart) -0104:0000* __nullarea -0104:01fc* __ovlflag -0104:01fd* __intno -0104:01fe* __ovlvec -0000:0b94 _cstart_ -0000:0c67* _Not_Enough_Memory_ -0000:0d99 __exit_ -0000:0db8 __do_exit_with_msg__ -0000:0e15 __GETDS +0393:0000* __nullarea +0393:0350* __ovlflag +0393:0351* __intno +0393:0352* __ovlvec +0000:0c24 _cstart_ +0000:0cf7* _Not_Enough_Memory_ +0000:0e29 __exit_ +0000:0e48 __do_exit_with_msg__ +0000:0ea5 __GETDS Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cmodel.asm) -0000:0e20 _big_code_ -0000:0e20* CodeModelMismatch -Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(i4m.asm) -0000:0e20 __I4M -0000:0e20* __U4M +0000:0eb0 _big_code_ +0000:0eb0* CodeModelMismatch +Module: /dos/fdos/watcom2/lib286/math87h.lib(floor.c) +0000:0eb8 floor_ +Module: /dos/fdos/watcom2/lib286/math87h.lib(fchop87.asm) +0000:0f0a __CHP Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(pia.asm) -0000:0e3f __PIA -0000:0e38* __PIS +0000:0f39 __PIA +0000:0f32* __PIS +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fltused.c) +0393:0356 _fltused_ +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(_8087086.asm) +0393:0358 __8087 +0393:0359 __real87 +0393:035a __dos87emucall +0393:035c __dos87real +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(i4m.asm) +0000:0f50 __I4M +0000:0f50* __U4M Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(kbhit.c) -0000:0e56 kbhit_ +0000:0f68 kbhit_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(xmsg.c) -0000:0e6d* __exit_with_msg_ -0000:0e72 __fatal_runtime_error_ +0000:0f7f* __exit_with_msg_ +0000:0f84 __fatal_runtime_error_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(crwdata) -0104:0202 __curbrk -0104:020a __STACKLOW -0104:020c __STACKTOP -0104:020e __cbyte -0104:0210 __child -0104:0212 __no87 -0104:021f ___FPE_handler -0104:0204 __psp -0104:0213 __get_ovl_stack -0104:0217 __restore_ovl_stack -0104:021b __close_ovl_file -0104:0223 __LpCmdLine -0104:0227 __LpPgmName -0104:0206 __osmajor -0104:0207 __osminor -0104:0208 __osmode -0104:0209 __HShift +0393:035e __curbrk +0393:0366 __STACKLOW +0393:0368 __STACKTOP +0393:036a __cbyte +0393:036c __child +0393:036e __no87 +0393:037b ___FPE_handler +0393:0360 __psp +0393:036f __get_ovl_stack +0393:0373 __restore_ovl_stack +0393:0377 __close_ovl_file +0393:037f __LpCmdLine +0393:0383 __LpPgmName +0393:0362 __osmajor +0393:0363 __osminor +0393:0364 __osmode +0393:0365 __HShift Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(cmain086.c) -0000:0e90 __CMain +0000:0fa2 __CMain Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(initrtns.c) -0000:0ef6 __InitRtns -0000:0ef6* __FInitRtns -0000:0f51 __FiniRtns -0000:0f51* __FFiniRtns +0000:1008 __InitRtns +0000:1008* __FInitRtns +0000:1063 __FiniRtns +0000:1063* __FFiniRtns Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(uselfn.c) -0104:022c ___uselfn +0393:0388 ___uselfn Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(dosseg) -0000:0fb6 __DOSseg__ +0000:10c8 __DOSseg__ +Module: /dos/fdos/watcom2/lib286/math87h.lib(modf87.asm) +0000:10ca modf_ +Module: /dos/fdos/watcom2/lib286/noemu87.lib(emustub.asm) +0000:0000* FJSRQQ +0000:0000* FISRQQ +0000:0000* FIERQQ +0000:0000 FIDRQQ +0000:0000 FIWRQQ +0000:0000 FJCRQQ +0000:0000* FJARQQ +0000:0000 FICRQQ +0000:0000* FIARQQ +0000:10ec* __init_87_emulator +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(setefg.c) +0000:10ec __setEFGfmt_ +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(chk8087.c) +0000:1124* _fpreset_ +0000:114f __init_8087_ +0000:1182+ __default_sigfpe_handler_ +0000:11d7 __chk8087_ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(enterdb.c) -0000:0fb7 __EnterWVIDEO_ -0104:022e+ ___WD_Present +0000:1247 __EnterWVIDEO_ +0393:03a8+ ___WD_Present Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(___argc.c) -0104:2948 ____Argv -0104:294c ____Argc +0393:2c1c ____Argv +0393:2c20 ____Argc Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(amblksiz.c) -0104:0230 __amblksiz +0393:03aa __amblksiz Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(exit.c) -0000:0fdb+ _null_exit_rtn_ -0000:0fdb+ __null_int23_exit_ -0000:0fdc exit_ -0000:0ffd+ _exit_ -0104:0232+ ___int23_exit -0104:0236+ ___FPE_handler_exit +0000:126b+ _null_exit_rtn_ +0000:126b+ __null_int23_exit_ +0000:126c exit_ +0000:128d+ _exit_ +0393:03ac+ ___int23_exit +0393:03b0 ___FPE_handler_exit Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sgdef086) -0104:023a __Start_XI -0104:0240 __End_XI -0104:0240 __Start_YI -0104:0240 __End_YI +0393:046c __Start_XI +0393:0484 __End_XI +0393:0484 __Start_YI +0393:0484 __End_YI +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(noefgfmt.c) +0393:03b4 ___EFG_printf +0393:03b8 ___EFG_scanf +Module: /dos/fdos/watcom2/lib286/math87h.lib(efgfmt.c) +0000:12bd _EFG_Format_ +Module: /dos/fdos/watcom2/lib286/math87h.lib(cnvs2d.c) +0000:148f __cnvs2d_ +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(8087cw.c) +0393:03bc __8087cw +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(save8087.c) +0393:03be ___Save8087 +0393:03c2 ___Rest8087 +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(grabfp87.c) +0000:14af __GrabFP87_ +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(ini87086.asm) +0000:14e2* __init_8087_emu +0000:14e8 __x87id +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(rtcntrl.c) +0000:1545* _SetLD64bit_ +0000:1550* _SetLD80bit_ +0000:155b _LDisDouble_ +Module: /dos/fdos/watcom2/lib286/math87h.lib(ldcvt.c) +0000:16c0 _LDScale10x_ +0000:1f98 __LDcvt_ +Module: /dos/fdos/watcom2/lib286/math87h.lib(strtod.c) +0000:2fa5+ __Strtold_ +0000:31e4 strtod_ +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpe87.asm) +0000:338a __Init_FPE_handler_ +0000:33c3 __Fini_FPE_handler_ +0000:33fa* __FPEHandler +Module: /dos/fdos/watcom2/lib286/math87h.lib(ldclass.c) +0000:368c __LDClass_ +0000:3712* _FLClass_ +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(i4d.asm) +0000:3726 __I4D +0000:3775* __U4D +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(istable.c) +0393:0044 __IsTable +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(tolower.c) +0000:37f9 tolower_ +Module: /dos/fdos/watcom2/lib286/math87h.lib(bufld086.asm) +0000:3808 __ZBuf2LD +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(seterrno.c) +0000:38d0* __set_EDOM_ +0000:38dc __set_ERANGE_ +0000:38e8* __set_EINVAL_ +Module: /dos/fdos/watcom2/lib286/math87h.lib(inf_nan.c) +0393:0146* ___f_infinity +0393:014a* ___f_posqnan +0393:014e ___d_infinity +0393:0156 ___d_posqnan +0393:015e* ___ld_infinity +0393:0166* ___ld_posqnan +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(hugeval.c) +0393:016e __HugeValue +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(fpeint.c) +0393:046a ___FPE_int +Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(errno.c) +0000:3902* __get_errno_ptr_ +0393:2e26 _errno +---------------------------+ @@ -189,14 +284,14 @@ Module: /dos/fdos/watcom2/lib286/dos/clibh.lib(sgdef086) Undefined Symbol Referenced by ================ ============= -init_copper_ plzpart.o(/dos/z/plz/plzpart.c) setplzparas_ plz.o(/dos/z/plz/plz.c) plzline_ plz.o(/dos/z/plz/plz.c) -init_copper_ plz.o(/dos/z/plz/plz.c) +--------------------+ | Libraries Used | +--------------------+ +/dos/fdos/watcom2/lib286/noemu87.lib +/dos/fdos/watcom2/lib286/math87h.lib /dos/fdos/watcom2/lib286/dos/clibh.lib diff --git a/plzpart.o b/plzpart.o index 4eab065..8a510fa 100755 Binary files a/plzpart.o and b/plzpart.o differ