atsoft-commit Mailing List for Atani Software (Page 2)
Brought to you by:
atani
Menu
▾
▴
atsoft-commit — this mailing list is for the commit notices
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
(21) |
Mar
|
Apr
(16) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(2) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Mike D. <at...@us...> - 2002-02-14 05:56:30
|
Update of /cvsroot/atsoft/dcgen/main
In directory usw-pr-cvs1:/tmp/cvs-serv5112/main
Modified Files:
generator.c reg68k.c ui-kos.c vdp.c
Log Message:
Index: generator.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/generator.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** generator.c 13 Feb 2002 07:57:25 -0000 1.10
--- generator.c 14 Feb 2002 05:56:27 -0000 1.11
***************
*** 25,29 ****
unsigned int gen_quit = 0;
unsigned int gen_debugmode = 0;
! unsigned int gen_loglevel = 0; /* 2 = NORMAL, 1 = CRITICAL */
unsigned int gen_autodetect = 1; /* 0 = no, 1 = yes */
unsigned int gen_musiclog = 0; /* 0 = no, 1 = GYM, 2 = GNM */
--- 25,29 ----
unsigned int gen_quit = 0;
unsigned int gen_debugmode = 0;
! unsigned int gen_loglevel = 3; /* 2 = NORMAL, 1 = CRITICAL */
unsigned int gen_autodetect = 1; /* 0 = no, 1 = yes */
unsigned int gen_musiclog = 0; /* 0 = no, 1 = GYM, 2 = GNM */
Index: reg68k.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/reg68k.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** reg68k.c 18 Jan 2002 02:42:51 -0000 1.1.1.1
--- reg68k.c 14 Feb 2002 05:56:27 -0000 1.2
***************
*** 90,97 ****
do {
- //#ifndef DREAMCAST
pc24 = reg68k_pc & 0xffffff;
if ((pc24 & 0xff0000) == 0xff0000) {
- //#endif
/* executing code from RAM, do not use compiled information */
do {
--- 90,95 ----
***************
*** 109,113 ****
while (!step_piib->flags.endblk);
list = NULL; /* stop compiler warning ;( */
- //#ifndef DREAMCAST
} else {
index = (pc24 >> 1) & (LEN_IPCLISTTABLE - 1);
--- 107,110 ----
***************
*** 141,145 ****
cpu68k_clocks += list->clocks;
}
- //#endif
}
while (clks > 0);
--- 138,141 ----
Index: ui-kos.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/ui-kos.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ui-kos.c 13 Feb 2002 07:57:25 -0000 1.6
--- ui-kos.c 14 Feb 2002 05:56:27 -0000 1.7
***************
*** 16,20 ****
// This is used to enable the 64bit transfer of the txr
// to the TA from the internal array (palette expanded).
! #define USE_64_BIT_TXR_XFER 1
// Do not use a twiddled txr as it is really slow.
--- 16,22 ----
// This is used to enable the 64bit transfer of the txr
// to the TA from the internal array (palette expanded).
! //#define USE_64_BIT_TXR_XFER 1
! #undef USE_64_BIT_TXR_XFER
! // the USE_64_BIT_TXR_XFER is broken right now. Will be fixed shortly.
// Do not use a twiddled txr as it is really slow.
***************
*** 29,34 ****
uint8 screen[512*512];
uint16 screen_ex[512*512];
! pvr_poly_hdr_t screen_poly;
! pvr_poly_hdr_t screen_poly_pal;
#define PAL_FMT_RGB565 1
#define PAL_BANK_SHIFT (25)
--- 31,36 ----
uint8 screen[512*512];
uint16 screen_ex[512*512];
! pvr_poly_cxt_t txr_ex_ctx;
! pvr_poly_cxt_t txr_pal_ctx;
#define PAL_FMT_RGB565 1
#define PAL_BANK_SHIFT (25)
***************
*** 89,94 ****
int ui_init(int argc, char *argv[])
{
- pvr_poly_cxt_t tmp;
- pvr_poly_cxt_t pal_tmp;
txr_base = (pvr_ptr_t)pvr_mem_malloc(512*512);
txr_base_ex = (pvr_ptr_t)pvr_mem_malloc(512*512*2);
--- 91,94 ----
***************
*** 97,110 ****
//*(volatile uint32 *)0xa05f8108 = PAL_FMT_RGB565;
! PVR_SET(PVR_TEXTURE_MODULO, 10);
! pvr_poly_cxt_txr(&pal_tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_PAL8BPP, 512, 512, txr_base, 0);
#ifdef USE_TWIDDLED_TXR
! pvr_poly_cxt_txr(&tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_RGB565, 512, 512, txr_base_ex, 0);
#else
! pvr_poly_cxt_txr(&tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_RGB565|PVR_TXRFMT_NONTWIDDLED, 512, 512, txr_base_ex, 0);
#endif
- pvr_poly_compile(&screen_poly, &tmp);
- pvr_poly_compile(&screen_poly_pal, &pal_tmp);
ui_initjoysticks();
return 0;
--- 97,108 ----
//*(volatile uint32 *)0xa05f8108 = PAL_FMT_RGB565;
! //PVR_SET(PVR_TEXTURE_MODULO, 10);
! pvr_poly_cxt_txr(&txr_pal_ctx, PVR_LIST_TR_POLY, PVR_TXRFMT_PAL8BPP, 512, 512, txr_base, 0);
#ifdef USE_TWIDDLED_TXR
! pvr_poly_cxt_txr(&txr_ex_ctx, PVR_LIST_TR_POLY, PVR_TXRFMT_RGB565, 512, 512, txr_base_ex, 0);
#else
! pvr_poly_cxt_txr(&txr_ex_ctx, PVR_LIST_TR_POLY, PVR_TXRFMT_RGB565|PVR_TXRFMT_NONTWIDDLED, 512, 512, txr_base_ex, 0);
#endif
ui_initjoysticks();
return 0;
***************
*** 209,213 ****
}
! void __inline palette_update()
{
int i;
--- 207,211 ----
}
! void inline palette_update()
{
int i;
***************
*** 248,253 ****
unsigned int *d = (unsigned int *)(void *)
(0xe0000000 | (((unsigned long)dest) & 0x03ffffe0));
! QACR0 = ((0xa4000000>>26)<<2)&0x1c;
! QACR1 = ((0xa4000000>>26)<<2)&0x1c;
while(cnt--) {
COPYPIXEL(0);
--- 246,251 ----
unsigned int *d = (unsigned int *)(void *)
(0xe0000000 | (((unsigned long)dest) & 0x03ffffe0));
! QACR0 = (((unsigned int)dest>>26)<<2)&0x1c;
! QACR1 = (((unsigned int)dest>>26)<<2)&0x1c;
while(cnt--) {
COPYPIXEL(0);
***************
*** 297,301 ****
vdp_renderline(line, p, 0);
}
! palette_update();
}
--- 295,299 ----
vdp_renderline(line, p, 0);
}
! //palette_update();
}
***************
*** 303,306 ****
--- 301,305 ----
{
pvr_vertex_t vert;
+ pvr_poly_hdr_t screen_poly;
uint32 y_size = 240;
uint32 x_size = 320;
***************
*** 333,340 ****
--- 332,341 ----
{
txr_twiddle_copy_general(&screen[0], txr_base, 512, 512, 8);
+ pvr_poly_compile(&screen_poly, &txr_pal_ctx);
}
else
{
uint32 y_offs = 0;
+ pvr_poly_compile(&screen_poly, &txr_ex_ctx);
#ifdef USE_64_BIT_TXR_XFER
unsigned short *dst = (unsigned short *)txr_base_ex;
***************
*** 365,381 ****
pvr_wait_ready();
pvr_scene_begin();
pvr_list_begin(PVR_LIST_OP_POLY);
pvr_dummy_poly(PVR_LIST_OP_POLY);
pvr_list_finish();
pvr_list_begin(PVR_LIST_TR_POLY);
! pvr_dummy_poly(PVR_LIST_TR_POLY);
! if(ui_rendermode == PALETTED_TXR)
! {
! pvr_prim(&screen_poly_pal, sizeof(screen_poly_pal));
! }
! else
! {
! pvr_prim(&screen_poly, sizeof(screen_poly));
! }
vert.flags = PVR_CMD_VERTEX;
vert.argb = PVR_PACK_COLOR(1,1,1,1);
--- 366,377 ----
pvr_wait_ready();
pvr_scene_begin();
+
pvr_list_begin(PVR_LIST_OP_POLY);
pvr_dummy_poly(PVR_LIST_OP_POLY);
pvr_list_finish();
+
pvr_list_begin(PVR_LIST_TR_POLY);
! pvr_prim(&screen_poly, sizeof(screen_poly));
!
vert.flags = PVR_CMD_VERTEX;
vert.argb = PVR_PACK_COLOR(1,1,1,1);
***************
*** 409,412 ****
--- 405,409 ----
pvr_list_finish();
+
pvr_scene_finish();
}
Index: vdp.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/vdp.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** vdp.c 24 Jan 2002 06:05:36 -0000 1.3
--- vdp.c 14 Feb 2002 05:56:27 -0000 1.4
***************
*** 214,218 ****
LOG_DEBUG1(("%08X STATUS READ %02X", regs68k.pc, ret));
- LOG_VERBOSE(("%08X STATUS READ %02X", regs68k.pc, ret));
return (ret);
--- 214,217 ----
***************
*** 1436,1441 ****
unsigned int i, line;
uint32 background;
! unsigned int vertcells = vdp_reg[1] & 1 << 3 ? 30 : 28;
! uint8 *linedata;
/* fill in background */
--- 1435,1440 ----
unsigned int i, line;
uint32 background;
! unsigned int vertcells = (vdp_reg[1] & 0x08) ? 30 : 28;
! uint8 *linedata = framedata;
/* fill in background */
***************
*** 1446,1469 ****
for (line = 0; line < vertcells * 8; line++) {
! linedata = framedata + line * lineoffset;
for (i = 0; i < (320 / 4); i++) {
((uint32 *)linedata)[i] = background;
}
}
if (vdp_reg[1] & 1 << 6) {
if (vdp_layerB)
vdp_layer_simple(1, 0, framedata, lineoffset);
if (vdp_layerA)
vdp_layer_simple(0, 0, framedata, lineoffset);
if (vdp_layerH && (vdp_reg[12] & 1 << 3))
vdp_shadow_simple(framedata, lineoffset);
if (vdp_layerS)
vdp_sprites_simple(0, framedata, lineoffset);
if (vdp_layerBp)
vdp_layer_simple(1, 1, framedata, lineoffset);
if (vdp_layerAp)
vdp_layer_simple(0, 1, framedata, lineoffset);
if (vdp_layerSp)
vdp_sprites_simple(1, framedata, lineoffset);
}
--- 1445,1488 ----
for (line = 0; line < vertcells * 8; line++) {
! #ifdef DREAMCAST
! memset4(linedata, background, 320/4);
! #else
for (i = 0; i < (320 / 4); i++) {
((uint32 *)linedata)[i] = background;
}
+ #endif
+ linedata += lineoffset;
}
if (vdp_reg[1] & 1 << 6) {
+ #ifndef DREAMCAST
if (vdp_layerB)
+ #endif
vdp_layer_simple(1, 0, framedata, lineoffset);
+ #ifndef DREAMCAST
if (vdp_layerA)
+ #endif
vdp_layer_simple(0, 0, framedata, lineoffset);
+ #ifdef DREAMCAST
+ if (vdp_reg[12] & 0x08)
+ #else
if (vdp_layerH && (vdp_reg[12] & 1 << 3))
+ #endif
vdp_shadow_simple(framedata, lineoffset);
+ #ifndef DREAMCAST
if (vdp_layerS)
+ #endif
vdp_sprites_simple(0, framedata, lineoffset);
+ #ifndef DREAMCAST
if (vdp_layerBp)
+ #endif
vdp_layer_simple(1, 1, framedata, lineoffset);
+ #ifndef DREAMCAST
if (vdp_layerAp)
+ #endif
vdp_layer_simple(0, 1, framedata, lineoffset);
+ #ifndef DREAMCAST
if (vdp_layerSp)
+ #endif
vdp_sprites_simple(1, framedata, lineoffset);
}
***************
*** 1895,1899 ****
cellinfo =
LOCENDIAN16(patterndata[(hoffset >> 3) + hwidth * (voffset >> 3)]);
! if (((uint8)((cellinfo & 1 << 15) ? 1 : 0)) == priority) {
/* plot cell */
palette = (cellinfo >> 13) & 3;
--- 1914,1918 ----
cellinfo =
LOCENDIAN16(patterndata[(hoffset >> 3) + hwidth * (voffset >> 3)]);
! if (((uint8)((cellinfo & 0x8000) ? 1 : 0)) == priority) {
/* plot cell */
palette = (cellinfo >> 13) & 3;
|
|
From: Mike D. <at...@us...> - 2002-02-14 05:56:30
|
Update of /cvsroot/atsoft/dcgen/cpu68k
In directory usw-pr-cvs1:/tmp/cvs-serv5112/cpu68k
Modified Files:
Makefile gen68k.c
Log Message:
Index: Makefile
===================================================================
RCS file: /cvsroot/atsoft/dcgen/cpu68k/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile 13 Feb 2002 07:57:25 -0000 1.3
--- Makefile 14 Feb 2002 05:56:27 -0000 1.4
***************
*** 17,20 ****
--- 17,21 ----
clean:
+ rm -f $(OBJS)
rm -f def68k def68k.exe
rm -f gen68k gen68k.exe
***************
*** 22,23 ****
--- 23,25 ----
rm -f def68k-*.h
rm -f def68k_exe gen68k_exe
+ rm -f *~
Index: gen68k.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/cpu68k/gen68k.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gen68k.c 13 Feb 2002 07:57:25 -0000 1.2
--- gen68k.c 14 Feb 2002 05:56:27 -0000 1.3
***************
*** 491,495 ****
--- 491,498 ----
#ifdef DREAMCAST
if(!flags)
+ {
+ iib->size = sz_word;
break;
+ }
#endif
generate_ea(output, iib, tp_src, 1);
***************
*** 886,890 ****
generate_ea(output, iib, tp_src, 1);
#ifndef DREAMCAST
! generate_eaval(output, iib, tp_src); /* read before write */
#endif
generate_outdata(output, iib, "0");
--- 889,893 ----
generate_ea(output, iib, tp_src, 1);
#ifndef DREAMCAST
! generate_eaval(output, iib, tp_src); // read before write
#endif
generate_outdata(output, iib, "0");
***************
*** 1198,1206 ****
case i_RESET:
OUT(" printf(\"RESET @ %x\\n\", (unsigned int)PC);\n");
- #ifdef DREAMCAST
OUT(" arch_exit(1);\n");
- #else
- OUT(" exit(1);\n");
- #endif
break;
--- 1201,1205 ----
***************
*** 1782,1790 ****
case i_ILLG:
OUT(" printf(\"Illegal instruction @ %x\\n\", (unsigned int)PC);\n");
- #ifdef DREAMCAST
OUT(" arch_exit(1);\n");
- #else
- OUT(" exit(1);\n");
- #endif
break;
--- 1781,1785 ----
***************
*** 1832,1845 ****
if (type == tp_src) {
fprintf(o, " uint32 srcaddr = ADDRREG(srcreg);\n");
- #ifndef DREAMCAST
fprintf(o, " uint32 srcaddr_tmp = (ADDRREG(srcreg)+= "
"(srcreg == 7 ? 2 : 1), 0);\n");
- #endif
} else {
fprintf(o, " uint32 dstaddr = ADDRREG(dstreg);\n");
- #ifndef DREAMCAST
fprintf(o, " uint32 dstaddr_tmp = (ADDRREG(dstreg)+= "
"(dstreg == 7 ? 2 : 1), 0);\n");
- #endif
}
break;
--- 1827,1836 ----
|
|
From: Mike D. <at...@us...> - 2002-02-14 05:56:30
|
Update of /cvsroot/atsoft/dcgen
In directory usw-pr-cvs1:/tmp/cvs-serv5112
Modified Files:
ChangeLog Makefile.prefab
Log Message:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/atsoft/dcgen/ChangeLog,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ChangeLog 13 Feb 2002 07:57:25 -0000 1.7
--- ChangeLog 14 Feb 2002 05:56:27 -0000 1.8
***************
*** 1,2 ****
--- 1,14 ----
+ [2002-02-13] -- Atani
+ -- Fixed a couple bugs with the new "smaller" 68000 core. For some
+ reason there are two variables which can not be removed from the
+ code, even though they are not referenced.
+ -- Added new makefile variable "EXP_OPT" which enables many optimization
+ flags for the sh-elf compiler.
+ -- Fixed the "clean" target in the cpu68k directory, it wasnt deleting
+ the object files.
+ -- Set the default "log-level" to 3 (verbose).
+ -- Started work towards making the "simple" render mode more stable.
+ Still lots more work to do. Receiving evt 00e0 at random points.
+
[2002-02-12] -- Atani
-- Added new define in makefile to disable the "START TO EXIT GUI" key.
Index: Makefile.prefab
===================================================================
RCS file: /cvsroot/atsoft/dcgen/Makefile.prefab,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.prefab 13 Feb 2002 07:57:25 -0000 1.3
--- Makefile.prefab 14 Feb 2002 05:56:27 -0000 1.4
***************
*** 36,39 ****
--- 36,43 ----
endif
+ ifdef EXP_OPT
+ KOS_LOCAL_CFLAGS += -falign-functions -falign-jumps -falign-loops -fdce -fssa -fregmove -ffast-math -frerun-loop-opt -frerun-cse-after-loop -fgcse -funroll-all-loops -fdelete-null-pointer-checks -finline-functions -fmove-all-movables -freduce-all-givs -fexpensive-optimizations -fno-rtti
+ endif
+
include $(KOS_BASE)/Makefile.rules
|
|
From: Mike D. <at...@us...> - 2002-02-13 07:57:28
|
Update of /cvsroot/atsoft/dcgen/main
In directory usw-pr-cvs1:/tmp/cvs-serv21015/main
Modified Files:
Makefile generator.c ta_text.c ui-kos.c
Removed Files:
sndstream.c
Log Message:
1) Completed the pvr_* migration.
2) Cleaned up the cpu68k to remove about 11kb of "dead" code
3) See ChangeLog for more details.
Index: Makefile
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Makefile 26 Jan 2002 03:51:44 -0000 1.4
--- Makefile 13 Feb 2002 07:57:25 -0000 1.5
***************
*** 1,5 ****
#OBJS = cpu68k.o cpuz80.o event.o font.o generator.o gensound.o initcart.o logo.o mem68k.o memz80.o reg68k.o snprintf.o state.o ui-console.o vdp.o gensoundp-kos.o uip-kos.o uiplot.o sndstream.o ta_text.o
! OBJS = cpu68k.o cpuz80.o event.o font.o generator.o gensound.o initcart.o logo.o mem68k.o memz80.o reg68k.o snprintf.o state.o vdp.o gensoundp-kos.o ui-kos.o sndstream.o ta_text.o
SUBDIRS =
--- 1,5 ----
#OBJS = cpu68k.o cpuz80.o event.o font.o generator.o gensound.o initcart.o logo.o mem68k.o memz80.o reg68k.o snprintf.o state.o ui-console.o vdp.o gensoundp-kos.o uip-kos.o uiplot.o sndstream.o ta_text.o
! OBJS = cpu68k.o cpuz80.o event.o font.o generator.o gensound.o initcart.o logo.o mem68k.o memz80.o reg68k.o snprintf.o state.o vdp.o gensoundp-kos.o ui-kos.o ta_text.o
SUBDIRS =
Index: generator.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/generator.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** generator.c 10 Feb 2002 22:41:06 -0000 1.9
--- generator.c 13 Feb 2002 07:57:25 -0000 1.10
***************
*** 127,131 ****
pvr_scene_begin();
pvr_list_begin(PVR_LIST_OP_POLY);
! pvr_dummy_poly(TA_OPAQUE);
pvr_list_finish();
pvr_list_begin(PVR_LIST_TR_POLY);
--- 127,131 ----
pvr_scene_begin();
pvr_list_begin(PVR_LIST_OP_POLY);
! pvr_dummy_poly(PVR_LIST_OP_POLY);
pvr_list_finish();
pvr_list_begin(PVR_LIST_TR_POLY);
***************
*** 269,273 ****
pvr_scene_begin();
pvr_list_begin(PVR_LIST_OP_POLY);
! pvr_dummy_poly(TA_OPAQUE);
pvr_list_finish();
pvr_list_begin(PVR_LIST_TR_POLY);
--- 269,273 ----
pvr_scene_begin();
pvr_list_begin(PVR_LIST_OP_POLY);
! pvr_dummy_poly(PVR_LIST_OP_POLY);
pvr_list_finish();
pvr_list_begin(PVR_LIST_TR_POLY);
Index: ta_text.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/ta_text.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ta_text.c 10 Feb 2002 22:41:06 -0000 1.3
--- ta_text.c 13 Feb 2002 07:57:25 -0000 1.4
***************
*** 70,74 ****
pvr_prim(&vert, sizeof(vert));
! vert.flags = TA_VERTEX_EOL;
vert.x = x1 + 12.0f;
vert.y = y1;
--- 70,74 ----
pvr_prim(&vert, sizeof(vert));
! vert.flags = PVR_CMD_VERTEX_EOL;
vert.x = x1 + 12.0f;
vert.y = y1;
Index: ui-kos.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/ui-kos.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ui-kos.c 12 Feb 2002 05:56:20 -0000 1.5
--- ui-kos.c 13 Feb 2002 07:57:25 -0000 1.6
***************
*** 99,107 ****
PVR_SET(PVR_TEXTURE_MODULO, 10);
! pvr_poly_cxt_txr(&pal_tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_PAL8BPP, 512, 512, txr_base, TA_BILINEAR_FILTER);
#ifdef USE_TWIDDLED_TXR
! pvr_poly_cxt_txr(&tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_RGB565, 512, 512, txr_base_ex, TA_BILINEAR_FILTER);
#else
! pvr_poly_cxt_txr(&tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_RGB565|PVR_TXRFMT_NONTWIDDLED, 512, 512, txr_base_ex, TA_BILINEAR_FILTER);
#endif
pvr_poly_compile(&screen_poly, &tmp);
--- 99,107 ----
PVR_SET(PVR_TEXTURE_MODULO, 10);
! pvr_poly_cxt_txr(&pal_tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_PAL8BPP, 512, 512, txr_base, 0);
#ifdef USE_TWIDDLED_TXR
! pvr_poly_cxt_txr(&tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_RGB565, 512, 512, txr_base_ex, 0);
#else
! pvr_poly_cxt_txr(&tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_RGB565|PVR_TXRFMT_NONTWIDDLED, 512, 512, txr_base_ex, 0);
#endif
pvr_poly_compile(&screen_poly, &tmp);
***************
*** 366,373 ****
pvr_scene_begin();
pvr_list_begin(PVR_LIST_OP_POLY);
! pvr_dummy_poly(TA_OPAQUE);
pvr_list_finish();
pvr_list_begin(PVR_LIST_TR_POLY);
! pvr_dummy_poly(TA_TRANSLUCENT);
if(ui_rendermode == PALETTED_TXR)
{
--- 366,373 ----
pvr_scene_begin();
pvr_list_begin(PVR_LIST_OP_POLY);
! pvr_dummy_poly(PVR_LIST_OP_POLY);
pvr_list_finish();
pvr_list_begin(PVR_LIST_TR_POLY);
! pvr_dummy_poly(PVR_LIST_TR_POLY);
if(ui_rendermode == PALETTED_TXR)
{
***************
*** 380,384 ****
vert.flags = PVR_CMD_VERTEX;
vert.argb = PVR_PACK_COLOR(1,1,1,1);
! vert.oargb = PVR_PACK_COLOR(0,0,0,0);
vert.z = 256.0f;
vert.x = x;
--- 380,385 ----
vert.flags = PVR_CMD_VERTEX;
vert.argb = PVR_PACK_COLOR(1,1,1,1);
! vert.oargb = PVR_PACK_COLOR(1,0,0,0);
!
vert.z = 256.0f;
vert.x = x;
***************
*** 387,390 ****
--- 388,392 ----
vert.v = vdp_vislines/512.0f;
pvr_prim(&vert, sizeof(vert));
+
vert.x = x;
vert.y = y;
***************
*** 392,395 ****
--- 394,398 ----
vert.v = 0;
pvr_prim(&vert, sizeof(vert));
+
vert.x = x + x_size;
vert.y = y + y_size;
***************
*** 397,400 ****
--- 400,404 ----
vert.v = vdp_vislines/512.0f;
pvr_prim(&vert, sizeof(vert));
+
vert.flags = PVR_CMD_VERTEX_EOL;
vert.x = x + x_size;
--- sndstream.c DELETED ---
|
|
From: Mike D. <at...@us...> - 2002-02-13 07:57:28
|
Update of /cvsroot/atsoft/dcgen/gui
In directory usw-pr-cvs1:/tmp/cvs-serv21015/gui
Modified Files:
image.c options.c romlist.c
Log Message:
1) Completed the pvr_* migration.
2) Cleaned up the cpu68k to remove about 11kb of "dead" code
3) See ChangeLog for more details.
Index: image.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/gui/image.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** image.c 26 Jan 2002 03:51:44 -0000 1.2
--- image.c 13 Feb 2002 07:57:25 -0000 1.3
***************
*** 9,36 ****
/* Creates the utility texture used for the font and mouse cursor. The
resulting texture will be 256x256. */
! uint32 image_texture = 0;
void prep_image(char *file)
{
! if(image_texture == 0)
{
! image_texture = ta_txr_allocate(1024*1024*2);
}
jpeg_to_texture(file, image_texture, 1024, 1);
}
void show_image(float alpha, uint32 mode)
{
! poly_hdr_t poly;
! vertex_ot_t vert;
! ta_poly_hdr_txr(&poly, mode, TA_RGB565_TWID, 1024, 1024, image_texture, TA_BILINEAR_FILTER);
! ta_commit_poly_hdr(&poly);
! vert.flags = TA_VERTEX_NORMAL;
vert.z = 5.0f;
! vert.a = alpha;
! vert.r = vert.g = vert.b = 1.0f;
! vert.oa = alpha;
! vert.or = vert.og = vert.ob = 0.0f;
// bottom left
--- 9,36 ----
/* Creates the utility texture used for the font and mouse cursor. The
resulting texture will be 256x256. */
! pvr_ptr_t image_texture = NULL;
! pvr_poly_hdr_t image_header;
void prep_image(char *file)
{
! pvr_poly_cxt_t tmp;
! if(image_texture == NULL)
{
! image_texture = (pvr_ptr_t)pvr_mem_malloc(1024*1024*2);
}
jpeg_to_texture(file, image_texture, 1024, 1);
+ pvr_poly_cxt_txr(&tmp, PVR_LIST_OP_POLY, PVR_TXRFMT_RGB565, 1024, 1024, image_texture, PVR_FILTER_BILINEAR);
+ pvr_poly_compile(&image_header, &tmp);
}
void show_image(float alpha, uint32 mode)
{
! pvr_vertex_t vert;
! pvr_prim(&image_header, sizeof(image_header));
! vert.flags = PVR_CMD_VERTEX;
vert.z = 5.0f;
! vert.argb = PVR_PACK_COLOR(alpha, 1, 1, 1);
! vert.oargb = PVR_PACK_COLOR(alpha, 0, 0, 0);
// bottom left
***************
*** 39,43 ****
vert.u = 0.0f;
vert.v = 480.0f / 1024.0f;
! ta_commit_vertex(&vert, sizeof(vert));
// top left
--- 39,43 ----
vert.u = 0.0f;
vert.v = 480.0f / 1024.0f;
! pvr_prim(&vert, sizeof(vert));
// top left
***************
*** 46,50 ****
vert.u = 0.0f;
vert.v = 0.0f;
! ta_commit_vertex(&vert, sizeof(vert));
// bottom right
--- 46,50 ----
vert.u = 0.0f;
vert.v = 0.0f;
! pvr_prim(&vert, sizeof(vert));
// bottom right
***************
*** 53,64 ****
vert.u = 640.0f / 1024.0f;
vert.v = 480.0f / 1024.0f;
! ta_commit_vertex(&vert, sizeof(vert));
// top right
vert.x = 640.0f;
vert.y = 0.0f;
vert.u = 640.0f / 1024.0f;
vert.v = 0.0f;
! ta_commit_vertex(&vert, sizeof(vert));
}
--- 53,65 ----
vert.u = 640.0f / 1024.0f;
vert.v = 480.0f / 1024.0f;
! pvr_prim(&vert, sizeof(vert));
// top right
+ vert.flags = PVR_CMD_VERTEX_EOL;
vert.x = 640.0f;
vert.y = 0.0f;
vert.u = 640.0f / 1024.0f;
vert.v = 0.0f;
! pvr_prim(&vert, sizeof(vert));
}
Index: options.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/gui/options.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** options.c 24 Jan 2002 04:30:21 -0000 1.1
--- options.c 13 Feb 2002 07:57:25 -0000 1.2
***************
*** 90,94 ****
{
ta_begin_render();
! show_image(1.0f, TA_OPAQUE);
ta_commit_eol();
--- 90,94 ----
{
ta_begin_render();
! show_image(1.0f, PVR_LIST_OP_POLY);
ta_commit_eol();
Index: romlist.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/gui/romlist.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** romlist.c 12 Feb 2002 05:56:20 -0000 1.5
--- romlist.c 13 Feb 2002 07:57:25 -0000 1.6
***************
*** 62,66 ****
unsigned char exit = 0;
char filename[512];
- poly_hdr_t poly;
prep_image("/rd/rommenu.jpg");
--- 62,65 ----
***************
*** 72,83 ****
while(!exit)
{
! ta_poly_hdr_col(&poly, TA_TRANSLUCENT);
! ta_begin_render();
! show_image(1.0f, TA_OPAQUE);
! ta_commit_eol();
!
draw_listing();
! ta_commit_eol();
! ta_finish_frame();
if(cont_get_cond(maple_first_controller(), &cond) < 0)
--- 71,86 ----
while(!exit)
{
! pvr_wait_ready();
! pvr_scene_begin();
!
! pvr_list_begin(PVR_LIST_OP_POLY);
! show_image(1.0f, PVR_LIST_OP_POLY);
! pvr_list_finish();
!
! pvr_list_begin(PVR_LIST_TR_POLY);
draw_listing();
! pvr_list_finish();
!
! pvr_scene_finish();
if(cont_get_cond(maple_first_controller(), &cond) < 0)
***************
*** 85,92 ****
--- 88,97 ----
exit = 1;
}
+ #ifndef RELEASE_BUILD
else if(!(cond.buttons & CONT_START))
{
exit = 1;
}
+ #endif
else if(!(cond.buttons & CONT_DPAD_UP))
{
***************
*** 167,178 ****
while(!ui_check_cond(CONT_B))
{
! ta_begin_render();
! pvr_dummy_poly(TA_OPAQUE);
! ta_commit_eol();
draw_poly_strf(40.0f, 200.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "Error loading rom:");
draw_poly_strf(40.0f, 224.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, msg);
draw_poly_strf(40.0f, 400.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "PRESS B");
! ta_commit_eol();
! ta_finish_frame();
}
}
--- 172,186 ----
while(!ui_check_cond(CONT_B))
{
! pvr_wait_ready();
! pvr_scene_begin();
! pvr_list_begin(PVR_LIST_OP_POLY);
! pvr_dummy_poly(PVR_LIST_OP_POLY);
! pvr_list_finish();
! pvr_list_begin(PVR_LIST_OP_POLY);
draw_poly_strf(40.0f, 200.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "Error loading rom:");
draw_poly_strf(40.0f, 224.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, msg);
draw_poly_strf(40.0f, 400.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "PRESS B");
! pvr_list_finish();
! pvr_scene_finish();
}
}
|
|
From: Mike D. <at...@us...> - 2002-02-13 07:57:28
|
Update of /cvsroot/atsoft/dcgen/cpu68k
In directory usw-pr-cvs1:/tmp/cvs-serv21015/cpu68k
Modified Files:
Makefile gen68k.c
Log Message:
1) Completed the pvr_* migration.
2) Cleaned up the cpu68k to remove about 11kb of "dead" code
3) See ChangeLog for more details.
Index: Makefile
===================================================================
RCS file: /cvsroot/atsoft/dcgen/cpu68k/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile 26 Jan 2002 03:51:44 -0000 1.2
--- Makefile 13 Feb 2002 07:57:25 -0000 1.3
***************
*** 7,16 ****
def68k_exe:
! gcc -o def68k def68k.c tab68k.c -I$(DCGEN_BASE) -I$(DCGEN_BASE)/hdr -DNOT_KOS_COMPILE=1
./def68k
touch def68k_exe
gen68k_exe:
! gcc -o gen68k gen68k.c tab68k.c -I$(DCGEN_BASE) -I$(DCGEN_BASE)/hdr -DNOT_KOS_COMPILE=1
./gen68k
touch gen68k_exe
--- 7,16 ----
def68k_exe:
! gcc -o def68k def68k.c tab68k.c -I$(DCGEN_BASE) -I$(DCGEN_BASE)/hdr -DNOT_KOS_COMPILE=1 -DDREAMCAST=1
./def68k
touch def68k_exe
gen68k_exe:
! gcc -o gen68k gen68k.c tab68k.c -I$(DCGEN_BASE) -I$(DCGEN_BASE)/hdr -DNOT_KOS_COMPILE=1 -DDREAMCAST=1
./gen68k
touch gen68k_exe
Index: gen68k.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/cpu68k/gen68k.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gen68k.c 18 Jan 2002 02:42:45 -0000 1.1.1.1
--- gen68k.c 13 Feb 2002 07:57:25 -0000 1.2
***************
*** 452,455 ****
--- 452,459 ----
case i_CMP:
+ #ifdef DREAMCAST
+ if(!flags)
+ break;
+ #endif
generate_ea(output, iib, tp_src, 1);
generate_eaval(output, iib, tp_src);
***************
*** 485,488 ****
--- 489,496 ----
if (iib->dtype != dt_Areg || iib->size != sz_word)
OUT("Error\n");
+ #ifdef DREAMCAST
+ if(!flags)
+ break;
+ #endif
generate_ea(output, iib, tp_src, 1);
generate_eaval(output, iib, tp_src);
***************
*** 579,583 ****
--- 587,593 ----
generate_ea(output, iib, tp_src, 1);
generate_ea(output, iib, tp_dst, 1);
+ #ifndef DREAMCAST
generate_eaval(output, iib, tp_dst);
+ #endif
switch(iib->size) {
case sz_word:
***************
*** 875,879 ****
--- 885,891 ----
case i_CLR:
generate_ea(output, iib, tp_src, 1);
+ #ifndef DREAMCAST
generate_eaval(output, iib, tp_src); /* read before write */
+ #endif
generate_outdata(output, iib, "0");
OUT("\n");
***************
*** 1097,1100 ****
--- 1109,1116 ----
case i_TST:
+ #ifdef DREAMCAST
+ if(!flags)
+ break;
+ #endif
generate_ea(output, iib, tp_src, 1);
generate_eaval(output, iib, tp_src);
***************
*** 1181,1186 ****
case i_RESET:
! OUT(" printf(\"RESET @ %x\\n\", PC);\n");
OUT(" exit(1);\n");
break;
--- 1197,1206 ----
case i_RESET:
! OUT(" printf(\"RESET @ %x\\n\", (unsigned int)PC);\n");
! #ifdef DREAMCAST
! OUT(" arch_exit(1);\n");
! #else
OUT(" exit(1);\n");
+ #endif
break;
***************
*** 1479,1483 ****
--- 1499,1510 ----
generate_ea(output, iib, tp_dst, 1);
generate_eaval(output, iib, tp_dst);
+ #ifdef DREAMCAST
+ if(flags)
+ {
+ #endif
generate_bits(output, iib);
+ #ifdef DREAMCAST
+ }
+ #endif
OUT(" uint8 count = srcdata & 63;\n");
switch (iib->size) {
***************
*** 1754,1759 ****
case i_ILLG:
! OUT(" printf(\"Illegal instruction @ %x\\n\", PC);\n");
OUT(" exit(1);\n");
break;
--- 1781,1790 ----
case i_ILLG:
! OUT(" printf(\"Illegal instruction @ %x\\n\", (unsigned int)PC);\n");
! #ifdef DREAMCAST
! OUT(" arch_exit(1);\n");
! #else
OUT(" exit(1);\n");
+ #endif
break;
***************
*** 1801,1810 ****
--- 1832,1845 ----
if (type == tp_src) {
fprintf(o, " uint32 srcaddr = ADDRREG(srcreg);\n");
+ #ifndef DREAMCAST
fprintf(o, " uint32 srcaddr_tmp = (ADDRREG(srcreg)+= "
"(srcreg == 7 ? 2 : 1), 0);\n");
+ #endif
} else {
fprintf(o, " uint32 dstaddr = ADDRREG(dstreg);\n");
+ #ifndef DREAMCAST
fprintf(o, " uint32 dstaddr_tmp = (ADDRREG(dstreg)+= "
"(dstreg == 7 ? 2 : 1), 0);\n");
+ #endif
}
break;
|
|
From: Mike D. <at...@us...> - 2002-02-13 07:57:28
|
Update of /cvsroot/atsoft/dcgen
In directory usw-pr-cvs1:/tmp/cvs-serv21015
Modified Files:
ChangeLog Makefile.prefab config.h
Log Message:
1) Completed the pvr_* migration.
2) Cleaned up the cpu68k to remove about 11kb of "dead" code
3) See ChangeLog for more details.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/atsoft/dcgen/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ChangeLog 12 Feb 2002 05:56:20 -0000 1.6
--- ChangeLog 13 Feb 2002 07:57:25 -0000 1.7
***************
*** 1,2 ****
--- 1,17 ----
+ [2002-02-12] -- Atani
+ -- Added new define in makefile to disable the "START TO EXIT GUI" key.
+ when building a fresh build (or delete gui/romlist.o) do:
+ gmake release RELEASE_BUILD=1
+ and the "START" button will be disabled.
+ -- Completed the migration to the new pvr_* API.
+ -- Cleanedup the cpu68k/gen68k.c generated code to compile without
+ warnings and optimize out useless calculations when possible.
+ Now there are ZERO warnings in the cpu68k-*.c modules.
+ -- Removed the local copy of the sndstream.c as the one in KOS is now
+ better than the local copy, doubling that it wouldnt compile anymore.
+ -- Cleaned up the config.h to remove options that do not apply to the
+ DREAMCAST port.
+ -- In the "RELEASE_BUILD" mode all logging features are now disabled.
+
[2002-02-11] -- Atani
-- Updated a few more things for the new pvr_* API.
Index: Makefile.prefab
===================================================================
RCS file: /cvsroot/atsoft/dcgen/Makefile.prefab,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Makefile.prefab 10 Feb 2002 22:41:06 -0000 1.2
--- Makefile.prefab 13 Feb 2002 07:57:25 -0000 1.3
***************
*** 32,35 ****
--- 32,39 ----
KOS_LOCAL_CFLAGS = -I$(DCGEN_BASE)/hdr -I$(DCGEN_BASE)/mz80 -I$(DCGEN_BASE)/cpu68k -I$(DCGEN_BASE) -I$(DCGEN_BASE)/ym2612 -I$(DCGEN_BASE)/sn76496 -DDREAMCAST=1
+ ifdef RELEASE_BUILD
+ KOS_LOCAL_CFLAGS += -DRELEASE_BUILD=1 -DNOLOGGING=1
+ endif
+
include $(KOS_BASE)/Makefile.rules
Index: config.h
===================================================================
RCS file: /cvsroot/atsoft/dcgen/config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** config.h 23 Jan 2002 08:08:27 -0000 1.2
--- config.h 13 Feb 2002 07:57:25 -0000 1.3
***************
*** 1,24 ****
- /* config.h. Generated automatically by configure. */
- /* config.h.in. Generated automatically from configure.in by autoheader. */
-
- /* Define to empty if the keyword does not work. */
- /* #undef const */
-
- /* Define as __inline if that's what the C compiler calls it. */
- /* #undef inline */
-
- /* Define if you need to in order for stat and other things to work. */
- /* #undef _POSIX_SOURCE */
-
- /* Define as the return type of signal handlers (int or void). */
- #define RETSIGTYPE void
-
- /* Define if you have the ANSI C header files. */
- #define STDC_HEADERS 1
-
- /* Define if your processor stores words with the most significant
- byte first (like Motorola and SPARC, unlike Intel and VAX). */
- //#define WORDS_BIGENDIAN 1
-
/* The number of bytes in a unsigned char. */
#define SIZEOF_UNSIGNED_CHAR 1
--- 1,2 ----
***************
*** 39,62 ****
#define HAVE_SNPRINTF 1
- /* Define if you have the <tcl8.0.h> header file. */
- /* #undef HAVE_TCL8_0_H */
-
- /* Define if you have the <tk8.0.h> header file. */
- /* #undef HAVE_TK8_0_H */
-
/* Name of package */
#define PACKAGE "dcgenerator"
/* Version number of package */
! #define VERSION "0.34"
!
! /* Allegro version */
! //#undef ALLEGRO
#define DREAMCAST 1
- /* Define to use RAZE z80 emulation */
- /* #undef RAZE */
-
/* Define to use the portable C mz80 z80 emulation */
#define CMZ80 1
--- 17,28 ----
#define HAVE_SNPRINTF 1
/* Name of package */
#define PACKAGE "dcgenerator"
/* Version number of package */
! #define VERSION "0.34b"
#define DREAMCAST 1
/* Define to use the portable C mz80 z80 emulation */
#define CMZ80 1
***************
*** 65,77 ****
#define DIRECTRAM 1
- /* Define if you have an x86 processor */
- /* #undef PROCESSOR_INTEL */
-
- /* Define if you have a sparc processor */
- /* #undef PROCESSOR_SPARC */
-
- /* Define if you have an ARM processor */
- /* #undef PROCESSOR_ARM */
-
/* Define if you have an SH4 processor */
#define PROCESSOR_SH4 1
--- 31,34 ----
***************
*** 79,83 ****
/* Undefine if your processor can read unaligned 32-bit values */
#define ALIGNLONGS ALIGNLONGS
-
- /* Define to turn off all logging */
- //#define NOLOGGING 1
--- 36,37 ----
|
|
From: Mike D. <at...@us...> - 2002-02-12 05:56:23
|
Update of /cvsroot/atsoft/dcgen/main
In directory usw-pr-cvs1:/tmp/cvs-serv5206/main
Modified Files:
gensoundp-kos.c ui-kos.c
Log Message:
See ChangeLog
Index: gensoundp-kos.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/gensoundp-kos.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gensoundp-kos.c 26 Jan 2002 03:51:44 -0000 1.2
--- gensoundp-kos.c 12 Feb 2002 05:56:20 -0000 1.3
***************
*** 129,132 ****
--- 129,135 ----
buffered_samples = 0;
sound_playing = 0;
+ // For right now the sound is entirely disabled.
+ // The sound is to be worked on again in the near future.
+ return;
if(audio_buffer == NULL)
{
***************
*** 152,155 ****
--- 155,161 ----
void soundp_stop(void)
{
+ // For right now the sound is entirely disabled.
+ // The sound is to be worked on again in the near future.
+ return;
if(sound_playing)
{
***************
*** 165,169 ****
int soundp_samplesbuffered(void)
{
! return buffered_samples;
}
--- 171,179 ----
int soundp_samplesbuffered(void)
{
! // Right now this is hacked to return a value that will not force
! // a wait situation for the audio to catch up. For right now the
! // sound is entirely disabled. The sound is to be worked on again
! // in the near future.
! return 6;
}
***************
*** 171,174 ****
--- 181,187 ----
{
unsigned int i;
+ // For right now the sound is entirely disabled.
+ // The sound is to be worked on again in the near future.
+ return;
//printf("received %u samples\n", samples);
/* device is odd and is different to host endianness */
Index: ui-kos.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/ui-kos.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ui-kos.c 10 Feb 2002 22:41:06 -0000 1.4
--- ui-kos.c 12 Feb 2002 05:56:20 -0000 1.5
***************
*** 11,15 ****
#include "event.h"
#include "state.h"
- #include "initcart.h"
// General Video options:
--- 11,14 ----
***************
*** 41,45 ****
enum
{
! SCREEN_100, SCREEN_200, SCREEN_FULL
} ui_screenmode = SCREEN_200;
--- 40,44 ----
enum
{
! SCREEN_100, SCREEN_200
} ui_screenmode = SCREEN_200;
***************
*** 167,170 ****
--- 166,171 ----
if(!cond.ltrig && cond.rtrig)
{
+ ui_vdpsimple = !ui_vdpsimple;
+ /*
if(ui_rendermode == PALETTED_TXR)
{
***************
*** 175,178 ****
--- 176,180 ----
ui_rendermode = PALETTED_TXR;
}
+ */
}
else if(cond.ltrig && !cond.rtrig)
***************
*** 220,223 ****
--- 222,226 ----
pals[i + 64] = (r << 10) | (g << 5) | (b) | 0x510;
pals[i + 128] = (r << 10) | (g << 5) | (b);
+ vdp_cramf[i] = 0;
}
if(ui_rendermode != PALETTED_TXR) return;
***************
*** 244,248 ****
unsigned char *s = (unsigned char *)src;
unsigned int *d = (unsigned int *)(void *)
! (0xe0000000 | (((unsigned long)dest) & 0x03ffffc0));
QACR0 = ((0xa4000000>>26)<<2)&0x1c;
QACR1 = ((0xa4000000>>26)<<2)&0x1c;
--- 247,251 ----
unsigned char *s = (unsigned char *)src;
unsigned int *d = (unsigned int *)(void *)
! (0xe0000000 | (((unsigned long)dest) & 0x03ffffe0));
QACR0 = ((0xa4000000>>26)<<2)&0x1c;
QACR1 = ((0xa4000000>>26)<<2)&0x1c;
***************
*** 311,328 ****
vdp_renderframe(&screen[0], 512);
}
! if(ui_screenmode == SCREEN_200)
{
! y_size <<= 1;
! x_size <<= 1;
}
! else if(ui_screenmode == SCREEN_FULL)
{
y_size = 480;
x_size = 640;
- }
- else
- {
- x = 160;
- y = 80;
}
// on a VGA cable we need to offset by 40.
--- 314,326 ----
vdp_renderframe(&screen[0], 512);
}
! if(ui_screenmode == SCREEN_100)
{
! x = 160;
! y = 80;
}
! else
{
y_size = 480;
x_size = 640;
}
// on a VGA cable we need to offset by 40.
|
|
From: Mike D. <at...@us...> - 2002-02-12 05:56:22
|
Update of /cvsroot/atsoft/dcgen/gui
In directory usw-pr-cvs1:/tmp/cvs-serv5206/gui
Modified Files:
romlist.c
Log Message:
See ChangeLog
Index: romlist.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/gui/romlist.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** romlist.c 6 Feb 2002 07:11:20 -0000 1.4
--- romlist.c 12 Feb 2002 05:56:20 -0000 1.5
***************
*** 165,169 ****
if(msg != NULL)
{
! while(!ui_check_cond(CONT_START))
{
ta_begin_render();
--- 165,169 ----
if(msg != NULL)
{
! while(!ui_check_cond(CONT_B))
{
ta_begin_render();
***************
*** 172,176 ****
draw_poly_strf(40.0f, 200.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "Error loading rom:");
draw_poly_strf(40.0f, 224.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, msg);
! draw_poly_strf(40.0f, 400.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "PRESS START");
ta_commit_eol();
ta_finish_frame();
--- 172,176 ----
draw_poly_strf(40.0f, 200.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "Error loading rom:");
draw_poly_strf(40.0f, 224.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, msg);
! draw_poly_strf(40.0f, 400.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "PRESS B");
ta_commit_eol();
ta_finish_frame();
|
|
From: Mike D. <at...@us...> - 2002-02-12 05:56:22
|
Update of /cvsroot/atsoft/dcgen
In directory usw-pr-cvs1:/tmp/cvs-serv5206
Modified Files:
ChangeLog Makefile
Log Message:
See ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvsroot/atsoft/dcgen/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ChangeLog 10 Feb 2002 22:43:47 -0000 1.5
--- ChangeLog 12 Feb 2002 05:56:20 -0000 1.6
***************
*** 1,2 ****
--- 1,12 ----
+ [2002-02-11] -- Atani
+ -- Updated a few more things for the new pvr_* API.
+ -- Disabled switching into the paletted mode until it is fixed.
+ -- Enabled switching into the "simple" render mode. This is much
+ faster yet more unstable at times. (Current mapping: L1)
+ -- On romload abort switched from "START" to "B" to prevent accidental
+ exit during debugging.
+ -- Fixed screen shift, Thanks AndrewK for the patch to KOS (similar
+ patch applied to source in DCGen.
+
[2002-02-10] -- Atani
-- Updated to using the pvr_* api from KOS.
Index: Makefile
===================================================================
RCS file: /cvsroot/atsoft/dcgen/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile 26 Jan 2002 03:51:44 -0000 1.5
--- Makefile 12 Feb 2002 05:56:20 -0000 1.6
***************
*** 5,9 ****
myall: build subdirs romdisk_boot.o
rm -f $(BUILD_TARGET).elf
! ${KOS_CC} ${KOS_CFLAGS} ${KOS_LDFLAGS} -o $(BUILD_TARGET).elf ${KOS_START} build/*.o romdisk_boot.o setjmp.o -L${KOS_BASE}/lib -lkallisti -lgcc -lm -ljpeg -ldcutils -lkallisti
romdisk_boot.img:
--- 5,9 ----
myall: build subdirs romdisk_boot.o
rm -f $(BUILD_TARGET).elf
! ${KOS_CC} ${KOS_CFLAGS} ${KOS_LDFLAGS} -o $(BUILD_TARGET).elf ${KOS_START} build/*.o romdisk_boot.o setjmp.o -lm -ljpeg -ldcutils $(KOS_LIBS)
romdisk_boot.img:
|
|
From: Mike D. <at...@us...> - 2002-02-10 22:43:50
|
Update of /cvsroot/atsoft/dcgen
In directory usw-pr-cvs1:/tmp/cvs-serv31277
Modified Files:
ChangeLog
Log Message:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/atsoft/dcgen/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ChangeLog 6 Feb 2002 07:14:56 -0000 1.4
--- ChangeLog 10 Feb 2002 22:43:47 -0000 1.5
***************
*** 1,2 ****
--- 1,11 ----
+ [2002-02-10] -- Atani
+ -- Updated to using the pvr_* api from KOS.
+ Need updating to the GUI code to use the new API.
+ Need to fix items:
+ 1) paletted txr colors.
+ 2) abortting rom need change key from "START" to "B" or something.
+ 3) screen shift in non-paletted mode.
+ 4) Find hacks for PAL modes with new pvr_* API.
+
[2002-02-05] -- Atani
-- Added new 64bit txr transfer for non-palette based mode
|
|
From: Mike D. <at...@us...> - 2002-02-10 22:41:09
|
Update of /cvsroot/atsoft/dcgen/main
In directory usw-pr-cvs1:/tmp/cvs-serv30551/main
Modified Files:
cpu68k.c generator.c ta_text.c ui-kos.c
Log Message:
This is the preliminary pvr_* API upgrade. There are known issues with
this new port. Most notably is that palettes now work again but the colors
are totally wrong (again?) and when using non-paletted txrs the screen
shifts left by about 40 pixels or so... DP is looking into fixing this in
KOS soon.
Index: cpu68k.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/cpu68k.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** cpu68k.c 18 Jan 2002 02:42:47 -0000 1.1.1.1
--- cpu68k.c 10 Feb 2002 22:41:06 -0000 1.2
***************
*** 179,187 ****
void cpu68k_printipc(t_ipc * ipc)
{
! printf("IPC @ 0x%p\n", ipc);
! printf(" opcode: %04X, uses %X set %X\n", ipc->opcode, ipc->used,
! ipc->set);
! printf(" src = %08X\n", ipc->src);
! printf(" dst = %08X\n", ipc->dst);
}
--- 179,187 ----
void cpu68k_printipc(t_ipc * ipc)
{
! LOG_VERBOSE(("IPC @ 0x%p\n", ipc));
! LOG_VERBOSE((" opcode: %04X, uses %X set %X\n", ipc->opcode, ipc->used,
! ipc->set));
! LOG_VERBOSE((" src = %08X\n", ipc->src));
! LOG_VERBOSE((" dst = %08X\n", ipc->dst));
}
***************
*** 344,348 ****
instrs++;
if (instrs > size) {
! if (size > 10000)
ui_err("Something has gone seriously wrong @ %08X", pc);
size += 16;
--- 344,348 ----
instrs++;
if (instrs > size) {
! if (size > 100000)
ui_err("Something has gone seriously wrong @ %08X", pc);
size += 16;
***************
*** 400,411 ****
int i;
! printf("in cpu68k_reset [top]\n");
! printf("in cpu68k_reset [clear ram]\n");
memset(cpu68k_ram, 0, 0x10000);
! printf("in cpu68k_reset [set initial pc]\n");
regs68k.pc = fetchlong(4);
regs68k.regs[15] = fetchlong(0);
! printf("in cpu68k_reset PC: %08x REG[15]: %08x\n", regs68k.pc, regs68k.regs[15]);
regs68k.sr.sr_int = 0;
regs68k.sr.sr_struct.s = 1; /* Supervisor mode */
--- 400,411 ----
int i;
! LOG_VERBOSE(("in cpu68k_reset [top]\n"));
! LOG_VERBOSE(("in cpu68k_reset [clear ram]\n"));
memset(cpu68k_ram, 0, 0x10000);
! LOG_VERBOSE(("in cpu68k_reset [set initial pc]\n"));
regs68k.pc = fetchlong(4);
regs68k.regs[15] = fetchlong(0);
! LOG_VERBOSE(("in cpu68k_reset PC: %08x REG[15]: %08x\n", regs68k.pc, regs68k.regs[15]));
regs68k.sr.sr_int = 0;
regs68k.sr.sr_struct.s = 1; /* Supervisor mode */
***************
*** 414,418 ****
cpu68k_frames = 0; /* Number of frames */
! printf("in cpu68k_reset [clean ipclist]\n");
for (i = 0; i < LEN_IPCLISTTABLE; i++) {
if (ipclist[i]) {
--- 414,418 ----
cpu68k_frames = 0; /* Number of frames */
! LOG_VERBOSE(("in cpu68k_reset [clean ipclist]\n"));
for (i = 0; i < LEN_IPCLISTTABLE; i++) {
if (ipclist[i]) {
***************
*** 421,425 ****
}
}
! printf("in cpu68k_reset [end]\n");
}
--- 421,425 ----
}
}
! LOG_VERBOSE(("in cpu68k_reset [end]\n"));
}
Index: generator.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/generator.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** generator.c 6 Feb 2002 07:11:20 -0000 1.8
--- generator.c 10 Feb 2002 22:41:06 -0000 1.9
***************
*** 42,53 ****
void gen_setupcartinfo(void);
- static char thing[] = ("\n\nIt's the year 2000 is there anyone out there?\n"
- "\nIf you're from another planet put your hand in the "
- "air, say yeah!\n\n");
-
/*** Program entry point ***/
extern uint8 romdisk_boot[];
int main(int argc, char *argv[])
{
--- 42,55 ----
void gen_setupcartinfo(void);
/*** Program entry point ***/
extern uint8 romdisk_boot[];
+ pvr_init_params_t params =
+ {
+ {PVR_BINSIZE_16, PVR_BINSIZE_0, PVR_BINSIZE_16, PVR_BINSIZE_0, PVR_BINSIZE_0, },
+ 512*1024
+ };
+
int main(int argc, char *argv[])
{
***************
*** 62,70 ****
return 1;
}
! kos_init_all(IRQ_ENABLE|THD_ENABLE|TA_ENABLE, romdisk_boot);
! #ifdef PAL_DREAMCAST
! vid_init(DM_640x480_PAL_IL, PM_RGB565);
! ta_init_defaults();
! #endif
init_ta_text();
--- 64,73 ----
return 1;
}
! kos_init_all(IRQ_ENABLE|THD_ENABLE, romdisk_boot);
! pvr_init(¶ms);
! //#ifdef PAL_DREAMCAST
! // vid_init(DM_640x480_PAL_IL, PM_RGB565);
! // ta_init_defaults();
! //#endif
init_ta_text();
***************
*** 121,127 ****
void update_progress(const uint8 *romname, uint32 total, uint32 current, uint8 *info, int abortable )
{
! ta_begin_render();
pvr_dummy_poly(TA_OPAQUE);
! ta_commit_eol();
draw_poly_strf(40.0f, 224.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "%s %s", info, romname);
draw_poly_strf(40.0f, 250.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "%u/%u", current, total);
--- 124,133 ----
void update_progress(const uint8 *romname, uint32 total, uint32 current, uint8 *info, int abortable )
{
! pvr_wait_ready();
! pvr_scene_begin();
! pvr_list_begin(PVR_LIST_OP_POLY);
pvr_dummy_poly(TA_OPAQUE);
! pvr_list_finish();
! pvr_list_begin(PVR_LIST_TR_POLY);
draw_poly_strf(40.0f, 224.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "%s %s", info, romname);
draw_poly_strf(40.0f, 250.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "%u/%u", current, total);
***************
*** 130,135 ****
draw_poly_strf(40.0f, 400.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "PRESS B TO CANCEL LOADING");
}
! ta_commit_eol();
! ta_finish_frame();
}
--- 136,141 ----
draw_poly_strf(40.0f, 400.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "PRESS B TO CANCEL LOADING");
}
! pvr_list_finish();
! pvr_scene_finish();
}
***************
*** 149,153 ****
/* Check extension is not wrong */
extension = filename + strlen(filename) - 3;
! if (!strcasecmp(extension, "smd"))
{
LOG_VERBOSE(("attempting to recognize as SMD file\n"));
--- 155,159 ----
/* Check extension is not wrong */
extension = filename + strlen(filename) - 3;
! if (!stricmp(extension, "smd"))
{
LOG_VERBOSE(("attempting to recognize as SMD file\n"));
***************
*** 155,159 ****
}
! if ((file = fs_open(filename, O_RDONLY)) == -1) {
ui_err("unable to open file.\n");
return ("Unable to open file.");
--- 161,166 ----
}
! if ((file = fs_open(filename, O_RDONLY)) == -1)
! {
ui_err("unable to open file.\n");
return ("Unable to open file.");
***************
*** 173,183 ****
/* is this icky? */
if ((p = strrchr(filename, '/')) == NULL &&
! (p = strrchr(filename, '\\')) == NULL) {
snprintf(gen_leafname, sizeof(gen_leafname), "%s", filename);
! } else {
snprintf(gen_leafname, sizeof(gen_leafname), "%s", p + 1);
}
! if ((p = strrchr(gen_leafname, '.')) != NULL) {
! if ((!strcasecmp(p, ".smd")) || (!strcasecmp(p, ".bin")))
*p = '\0';
}
--- 180,194 ----
/* is this icky? */
if ((p = strrchr(filename, '/')) == NULL &&
! (p = strrchr(filename, '\\')) == NULL)
! {
snprintf(gen_leafname, sizeof(gen_leafname), "%s", filename);
! }
! else
! {
snprintf(gen_leafname, sizeof(gen_leafname), "%s", p + 1);
}
! if ((p = strrchr(gen_leafname, '.')) != NULL)
! {
! if ((!stricmp(p, ".smd")) || (!stricmp(p, ".bin")))
*p = '\0';
}
***************
*** 185,189 ****
snprintf(gen_leafname, sizeof(gen_leafname), "rom");
! cpu68k_rom = &genesis_rom;
gen_freerom = 0;
memset(cpu68k_rom, 0, cpu68k_romlen);
--- 196,200 ----
snprintf(gen_leafname, sizeof(gen_leafname), "rom");
! cpu68k_rom = (uint8 *)&genesis_rom;
gen_freerom = 0;
memset(cpu68k_rom, 0, cpu68k_romlen);
***************
*** 194,198 ****
if(imagetype == 2)
fs_seek(file, 512, SEEK_SET);
! do {
update_progress(gen_leafname, cpu68k_romlen, cpu68k_romlen-bytesleft, "Now Loading:", 1);
if ((bytes = fs_read(file, buffer, 0x4000)) <= 0)
--- 205,210 ----
if(imagetype == 2)
fs_seek(file, 512, SEEK_SET);
! do
! {
update_progress(gen_leafname, cpu68k_romlen, cpu68k_romlen-bytesleft, "Now Loading:", 1);
if ((bytes = fs_read(file, buffer, 0x4000)) <= 0)
***************
*** 210,214 ****
/* convert to standard BIN file format */
! switch (imagetype) {
case 1: /* BIN */
break;
--- 222,227 ----
/* convert to standard BIN file format */
! switch (imagetype)
! {
case 1: /* BIN */
break;
***************
*** 242,246 ****
gen_setupcartinfo();
! if (gen_autodetect) {
vdp_pal = (!gen_cartinfo.flag_usa && !gen_cartinfo.flag_japan &&
gen_cartinfo.flag_europe) ? 1 : 0;
--- 255,260 ----
gen_setupcartinfo();
! if (gen_autodetect)
! {
vdp_pal = (!gen_cartinfo.flag_usa && !gen_cartinfo.flag_japan &&
gen_cartinfo.flag_europe) ? 1 : 0;
***************
*** 252,258 ****
while(!ui_check_cond(CONT_START))
{
! ta_begin_render();
pvr_dummy_poly(TA_OPAQUE);
! ta_commit_eol();
draw_poly_strf(40.0f, 200.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "Loaded:");
draw_poly_strf(40.0f, 224.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "DOMESTIC: %s", gen_cartinfo.name_domestic);
--- 266,275 ----
while(!ui_check_cond(CONT_START))
{
! pvr_wait_ready();
! pvr_scene_begin();
! pvr_list_begin(PVR_LIST_OP_POLY);
pvr_dummy_poly(TA_OPAQUE);
! pvr_list_finish();
! pvr_list_begin(PVR_LIST_TR_POLY);
draw_poly_strf(40.0f, 200.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "Loaded:");
draw_poly_strf(40.0f, 224.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "DOMESTIC: %s", gen_cartinfo.name_domestic);
***************
*** 265,270 ****
}
draw_poly_strf(40.0f, 400.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "PRESS START");
! ta_commit_eol();
! ta_finish_frame();
}
gen_quit = 0;
--- 282,287 ----
}
draw_poly_strf(40.0f, 400.0f, 100.0f, 1.0f, 1.0f, 1.0f, 1.0f, "PRESS START");
! pvr_list_finish();
! pvr_scene_finish();
}
gen_quit = 0;
***************
*** 283,291 ****
gen_nicetext(gen_cartinfo.name_domestic, (char *)(cpu68k_rom + 0x120), 48);
gen_nicetext(gen_cartinfo.name_overseas, (char *)(cpu68k_rom + 0x150), 48);
! if (cpu68k_rom[0x180] == 'G' && cpu68k_rom[0x181] == 'M') {
gen_cartinfo.prodtype = pt_game;
! } else if (cpu68k_rom[0x180] == 'A' && cpu68k_rom[0x181] == 'I') {
gen_cartinfo.prodtype = pt_education;
! } else {
gen_cartinfo.prodtype = pt_unknown;
}
--- 300,313 ----
gen_nicetext(gen_cartinfo.name_domestic, (char *)(cpu68k_rom + 0x120), 48);
gen_nicetext(gen_cartinfo.name_overseas, (char *)(cpu68k_rom + 0x150), 48);
! if (cpu68k_rom[0x180] == 'G' && cpu68k_rom[0x181] == 'M')
! {
gen_cartinfo.prodtype = pt_game;
! }
! else if (cpu68k_rom[0x180] == 'A' && cpu68k_rom[0x181] == 'I')
! {
gen_cartinfo.prodtype = pt_education;
! }
! else
! {
gen_cartinfo.prodtype = pt_unknown;
}
***************
*** 294,298 ****
cpu68k_romlen - 0x200);
gen_nicetext(gen_cartinfo.memo, (char *)(cpu68k_rom + 0x1C8), 28);
! for (i = 0x1f0; i < 0x1ff; i++) {
if (cpu68k_rom[i] == 'J')
gen_cartinfo.flag_japan = 1;
--- 316,321 ----
cpu68k_romlen - 0x200);
gen_nicetext(gen_cartinfo.memo, (char *)(cpu68k_rom + 0x1C8), 28);
! for (i = 0x1f0; i < 0x1ff; i++)
! {
if (cpu68k_rom[i] == 'J')
gen_cartinfo.flag_japan = 1;
***************
*** 302,312 ****
gen_cartinfo.flag_europe = 1;
}
! if (cpu68k_rom[0x1f0] >= '1' && cpu68k_rom[0x1f0] <= '9') {
gen_cartinfo.hardware = cpu68k_rom[0x1f0] - '0';
! } else if (cpu68k_rom[0x1f0] >= 'A' && cpu68k_rom[0x1f0] <= 'F') {
gen_cartinfo.hardware = cpu68k_rom[0x1f0] - 'A' + 10;
}
p = gen_cartinfo.country;
! for (i = 0x1f0; i < 0x200; i++) {
if (cpu68k_rom[i] != 0 && cpu68k_rom[i] != 32)
*p++ = cpu68k_rom[i];
--- 325,339 ----
gen_cartinfo.flag_europe = 1;
}
! if (cpu68k_rom[0x1f0] >= '1' && cpu68k_rom[0x1f0] <= '9')
! {
gen_cartinfo.hardware = cpu68k_rom[0x1f0] - '0';
! }
! else if (cpu68k_rom[0x1f0] >= 'A' && cpu68k_rom[0x1f0] <= 'F')
! {
gen_cartinfo.hardware = cpu68k_rom[0x1f0] - 'A' + 10;
}
p = gen_cartinfo.country;
! for (i = 0x1f0; i < 0x200; i++)
! {
if (cpu68k_rom[i] != 0 && cpu68k_rom[i] != 32)
*p++ = cpu68k_rom[i];
***************
*** 325,331 ****
flag = 0; /* set if within word, e.g. make lowercase */
i = size; /* maximum number of chars in input */
! while ((c = *in++) && --i > 0) {
! if (c >= 'A' && c <= 'Z' || c >= 'a' && c <= 'z') {
! if (!flag) {
/* make uppercase */
flag = 1;
--- 352,361 ----
flag = 0; /* set if within word, e.g. make lowercase */
i = size; /* maximum number of chars in input */
! while ((c = *in++) && --i > 0)
! {
! if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z'))
! {
! if (!flag)
! {
/* make uppercase */
flag = 1;
***************
*** 334,338 ****
else
*out++ = c;
! } else {
/* make lowercase */
if (isupper(c))
--- 364,370 ----
else
*out++ = c;
! }
! else
! {
/* make lowercase */
if (isupper(c))
***************
*** 341,349 ****
*out++ = c;
}
! } else if (c == ' ') {
if (flag)
*out++ = c;
flag = 0;
! } else if (isprint(c) && c != '\t') {
flag = 0;
*out++ = c;
--- 373,385 ----
*out++ = c;
}
! }
! else if (c == ' ')
! {
if (flag)
*out++ = c;
flag = 0;
! }
! else if (isprint(c) && c != '\t')
! {
flag = 0;
*out++ = c;
***************
*** 361,370 ****
uint16 checksum = 0;
! if (length & 1) {
length &= ~1;
LOG_CRITICAL(("checksum routines given odd length (%d)", length));
}
! for (; length; length -= 2, start += 2) {
checksum += start[0] << 8;
checksum += start[1];
--- 397,408 ----
uint16 checksum = 0;
! if (length & 1)
! {
length &= ~1;
LOG_CRITICAL(("checksum routines given odd length (%d)", length));
}
! for (; length; length -= 2, start += 2)
! {
checksum += start[0] << 8;
checksum += start[1];
***************
*** 372,373 ****
--- 410,412 ----
return checksum;
}
+
Index: ta_text.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/ta_text.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ta_text.c 24 Jan 2002 04:30:21 -0000 1.2
--- ta_text.c 10 Feb 2002 22:41:06 -0000 1.3
***************
*** 7,11 ****
*/
! uint32 ta_text_txr = 0;
void init_ta_text()
--- 7,13 ----
*/
! pvr_ptr_t ta_text_txr = 0;
! pvr_poly_hdr_t font_header;
! pvr_poly_hdr_t color_header;
void init_ta_text()
***************
*** 13,18 ****
uint16 *txr;
uint32 x, y;
! ta_text_txr = ta_txr_allocate(256*256*2);
txr = ta_txr_map(ta_text_txr);
for(y = 0; y < 8; y++)
--- 15,22 ----
uint16 *txr;
uint32 x, y;
+ pvr_poly_cxt_t tmp;
+ pvr_poly_cxt_t tmp2;
! ta_text_txr = pvr_mem_malloc(256*256*2);
txr = ta_txr_map(ta_text_txr);
for(y = 0; y < 8; y++)
***************
*** 28,36 ****
txr += 23*256;
}
}
/* Draw one font character (12x24); assumes polygon header already sent */
void draw_poly_char(float x1, float y1, float z1, float a, float r, float g, float b, int c) {
! vertex_ot_t vert;
int ix = (c % 16) * 16;
int iy = (c / 16) * 24;
--- 32,44 ----
txr += 23*256;
}
+ pvr_poly_cxt_txr(&tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_ARGB1555|PVR_TXRFMT_NONTWIDDLED, 256, 256, ta_text_txr, PVR_FILTER_NONE);
+ pvr_poly_compile(&font_header, &tmp);
+ pvr_poly_cxt_col(&tmp2, PVR_LIST_TR_POLY);
+ pvr_poly_compile(&color_header, &tmp2);
}
/* Draw one font character (12x24); assumes polygon header already sent */
void draw_poly_char(float x1, float y1, float z1, float a, float r, float g, float b, int c) {
! pvr_vertex_t vert;
int ix = (c % 16) * 16;
int iy = (c / 16) * 24;
***************
*** 40,44 ****
float v2 = (iy+24) * 1.0f / 256.0f;
! vert.flags = TA_VERTEX_NORMAL;
vert.x = x1;
vert.y = y1 + 24.0f;
--- 48,52 ----
float v2 = (iy+24) * 1.0f / 256.0f;
! vert.flags = PVR_CMD_VERTEX;
vert.x = x1;
vert.y = y1 + 24.0f;
***************
*** 46,56 ****
vert.u = u1;
vert.v = v2;
! vert.dummy1 = vert.dummy2 = 0;
! vert.a = a;
! vert.r = r;
! vert.g = g;
! vert.b = b;
! vert.oa = vert.or = vert.og = vert.ob = 0.0f;
! ta_commit_vertex(&vert, sizeof(vert));
vert.x = x1;
--- 54,60 ----
vert.u = u1;
vert.v = v2;
! vert.argb = PVR_PACK_COLOR(a,r,g,b);
! vert.oargb = 0;
! pvr_prim(&vert, sizeof(vert));
vert.x = x1;
***************
*** 58,62 ****
vert.u = u1;
vert.v = v1;
! ta_commit_vertex(&vert, sizeof(vert));
vert.x = x1 + 12.0f;
--- 62,66 ----
vert.u = u1;
vert.v = v1;
! pvr_prim(&vert, sizeof(vert));
vert.x = x1 + 12.0f;
***************
*** 64,68 ****
vert.u = u2;
vert.v = v2;
! ta_commit_vertex(&vert, sizeof(vert));
vert.flags = TA_VERTEX_EOL;
--- 68,72 ----
vert.u = u2;
vert.v = v2;
! pvr_prim(&vert, sizeof(vert));
vert.flags = TA_VERTEX_EOL;
***************
*** 71,75 ****
vert.u = u2;
vert.v = v1;
! ta_commit_vertex(&vert, sizeof(vert));
}
--- 75,79 ----
vert.u = u2;
vert.v = v1;
! pvr_prim(&vert, sizeof(vert));
}
***************
*** 81,85 ****
va_list args;
char *s;
- poly_hdr_t poly;
va_start(args, fmt);
--- 85,88 ----
***************
*** 87,92 ****
va_end(args);
! ta_poly_hdr_txr(&poly, TA_TRANSLUCENT, TA_ARGB4444, 256, 256, ta_text_txr, TA_NO_FILTER);
! ta_commit_poly_hdr(&poly);
s = strbuf;
while (*s) {
--- 90,94 ----
va_end(args);
! pvr_prim(&font_header, sizeof(font_header));
s = strbuf;
while (*s) {
***************
*** 103,129 ****
float a1, float r1, float g1, float b1,
float a2, float r2, float g2, float b2) {
! poly_hdr_t poly;
! vertex_oc_t vert;
! ta_poly_hdr_col(&poly, TA_TRANSLUCENT);
! ta_commit_poly_hdr(&poly);
! vert.flags = TA_VERTEX_NORMAL;
vert.x = x1; vert.y = y2; vert.z = z;
! vert.a = (a1+a2)/2; vert.r = (r1+r2/2); vert.g = (g1+g2)/2; vert.b = (b1+b2)/2;
! ta_commit_vertex(&vert, sizeof(vert));
vert.y = y1;
! vert.a = a1; vert.r = r1; vert.g = g1; vert.b = b1;
! ta_commit_vertex(&vert, sizeof(vert));
vert.x = x2; vert.y = y2;
! vert.a = a2; vert.r = r2; vert.g = g2; vert.b = b2;
! ta_commit_vertex(&vert, sizeof(vert));
! vert.flags = TA_VERTEX_EOL;
vert.y = y1;
! vert.a = (a1+a2)/2; vert.r = (r1+r2/2); vert.g = (g1+g2)/2; vert.b = (b1+b2)/2;
! ta_commit_vertex(&vert, sizeof(vert));
}
--- 105,129 ----
float a1, float r1, float g1, float b1,
float a2, float r2, float g2, float b2) {
! pvr_vertex_t vert;
! pvr_prim(&color_header, sizeof(color_header));
! vert.flags = PVR_CMD_VERTEX;
vert.x = x1; vert.y = y2; vert.z = z;
! vert.argb = PVR_PACK_COLOR((a1+a2)/2, (r1+r2/2), (g1+g2)/2, (b1+b2)/2);
! pvr_prim(&vert, sizeof(vert));
vert.y = y1;
! vert.argb = PVR_PACK_COLOR(a1, r1, g1, b1);
! pvr_prim(&vert, sizeof(vert));
vert.x = x2; vert.y = y2;
! vert.argb = PVR_PACK_COLOR(a2, r2, g2, b2);
! pvr_prim(&vert, sizeof(vert));
! vert.flags = PVR_CMD_VERTEX_EOL;
vert.y = y1;
! vert.argb = PVR_PACK_COLOR((a1+a2)/2, (r1+r2/2), (g1+g2)/2, (b1+b2)/2);
! pvr_prim(&vert, sizeof(vert));
}
Index: ui-kos.c
===================================================================
RCS file: /cvsroot/atsoft/dcgen/main/ui-kos.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ui-kos.c 6 Feb 2002 07:11:20 -0000 1.3
--- ui-kos.c 10 Feb 2002 22:41:06 -0000 1.4
***************
*** 25,36 ****
char *ui_initload = NULL;
uint8 ui_vdpsimple = 0;
! uint32 txr_base;
! uint16 *txr_ptr;
! uint32 txr_base_ex;
! uint16 *txr_ptr_ex;
uint32 old_pal_fmt;
uint8 screen[512*512];
uint16 screen_ex[512*512];
!
#define PAL_FMT_RGB565 1
#define PAL_BANK_SHIFT (25)
--- 25,35 ----
char *ui_initload = NULL;
uint8 ui_vdpsimple = 0;
! pvr_ptr_t txr_base;
! pvr_ptr_t txr_base_ex;
uint32 old_pal_fmt;
uint8 screen[512*512];
uint16 screen_ex[512*512];
! pvr_poly_hdr_t screen_poly;
! pvr_poly_hdr_t screen_poly_pal;
#define PAL_FMT_RGB565 1
#define PAL_BANK_SHIFT (25)
***************
*** 91,105 ****
int ui_init(int argc, char *argv[])
{
! txr_base = ta_txr_allocate(512*512);
! txr_ptr = ta_txr_map(txr_base);
!
! txr_base_ex = ta_txr_allocate(512*512*2);
! txr_ptr_ex = ta_txr_map(txr_base_ex);
//old_pal_fmt = *(volatile uint32 *)0xa05f8108;
//*(volatile uint32 *)0xa05f8108 = PAL_FMT_RGB565;
! *(volatile unsigned int *)(0xa05f80e4) = 320/32; //stride
!
ui_initjoysticks();
return 0;
--- 90,111 ----
int ui_init(int argc, char *argv[])
{
! pvr_poly_cxt_t tmp;
! pvr_poly_cxt_t pal_tmp;
! txr_base = (pvr_ptr_t)pvr_mem_malloc(512*512);
! txr_base_ex = (pvr_ptr_t)pvr_mem_malloc(512*512*2);
//old_pal_fmt = *(volatile uint32 *)0xa05f8108;
//*(volatile uint32 *)0xa05f8108 = PAL_FMT_RGB565;
! PVR_SET(PVR_TEXTURE_MODULO, 10);
!
! pvr_poly_cxt_txr(&pal_tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_PAL8BPP, 512, 512, txr_base, TA_BILINEAR_FILTER);
! #ifdef USE_TWIDDLED_TXR
! pvr_poly_cxt_txr(&tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_RGB565, 512, 512, txr_base_ex, TA_BILINEAR_FILTER);
! #else
! pvr_poly_cxt_txr(&tmp, PVR_LIST_TR_POLY, PVR_TXRFMT_RGB565|PVR_TXRFMT_NONTWIDDLED, 512, 512, txr_base_ex, TA_BILINEAR_FILTER);
! #endif
! pvr_poly_compile(&screen_poly, &tmp);
! pvr_poly_compile(&screen_poly_pal, &pal_tmp);
ui_initjoysticks();
return 0;
***************
*** 108,111 ****
--- 114,119 ----
void ui_final()
{
+ pvr_mem_free(txr_base);
+ pvr_mem_free(txr_base_ex);
//*(volatile uint32 *)0xa05f8108 = old_pal_fmt;
}
***************
*** 199,220 ****
}
! void __inline palette_update(int flag)
{
int i;
! uint8 *p;
uint8 r, g, b;
for(i = 0; i < 64; i++)
{
! //if(flag || vdp_cramf[i])
! //{
! p = (uint8 *)vdp_cram + (i << 1);
! b = (p[0] & 0x0E);
! r = (p[1] & 0x0E);
! g = ((p[1] & 0xE0) >> 4);
! pals[i] = (r << 11) | (g << 6) | (b << 1);
! pals[i + 64] = (r << 10) | (g << 5) | (b) | 0x510;
! pals[i + 128] = (r << 10) | (g << 5) | (b);
! //vdp_cramf[i] = 0;
! //}
}
if(ui_rendermode != PALETTED_TXR) return;
--- 207,223 ----
}
! void __inline palette_update()
{
int i;
! uint8 *p = (uint8 *)vdp_cram;
uint8 r, g, b;
for(i = 0; i < 64; i++)
{
! b = (*p++ & 0x0E);
! r = (*p & 0x0E);
! g = ((*p++ & 0xE0) >> 4);
! pals[i] = (r << 11) | (g << 6) | (b << 1);
! pals[i + 64] = (r << 10) | (g << 5) | (b) | 0x510;
! pals[i + 128] = (r << 10) | (g << 5) | (b);
}
if(ui_rendermode != PALETTED_TXR) return;
***************
*** 270,274 ****
}
-
void ui_line(int line)
{
--- 273,276 ----
***************
*** 292,302 ****
vdp_renderline(line, p, 0);
}
! //palette_update(0);
}
void ui_endfield(void)
{
! poly_hdr_t poly;
! vertex_ot_t vert;
uint32 y_size = 240;
uint32 x_size = 320;
--- 294,303 ----
vdp_renderline(line, p, 0);
}
! palette_update();
}
void ui_endfield(void)
{
! pvr_vertex_t vert;
uint32 y_size = 240;
uint32 x_size = 320;
***************
*** 304,308 ****
uint32 u_max = (vdp_reg[12] & 1) ? 320 : 256;
! palette_update(1);
if(ui_vdpsimple)
--- 305,309 ----
uint32 u_max = (vdp_reg[12] & 1) ? 320 : 256;
! palette_update();
if(ui_vdpsimple)
***************
*** 333,359 ****
if(ui_rendermode == PALETTED_TXR)
{
- /*
- int x, y;
- for(y = 0; y < 512; y+=2)
- {
- for(x = 0; x < 512; x++)
- {
- txr_ptr[TWIDOUT(y/2, x) + (x+y)*512] =
- screen[(y*512)+x] | (screen[((y+1)*512)+x]<<8);
- }
- }
- */
txr_twiddle_copy_general(&screen[0], txr_base, 512, 512, 8);
- //txr_twiddle_copy(&screen[0], 512, 512, txr_base, 512, 512, 0);
- ta_poly_hdr_txr(&poly, TA_TRANSLUCENT, TA_PAL8BPP, 512, 512, txr_base, TA_BILINEAR_FILTER);
- poly.flags4 &= ~PAL_BANK_MASK;
- poly.flags4 |= 0 << PAL_BANK_SHIFT;
}
else
{
- uint32 x_offs = 0;
uint32 y_offs = 0;
#ifdef USE_64_BIT_TXR_XFER
! unsigned short *dst = (unsigned short *)txr_ptr_ex;
unsigned char *src = &screen[0];
--- 334,344 ----
if(ui_rendermode == PALETTED_TXR)
{
txr_twiddle_copy_general(&screen[0], txr_base, 512, 512, 8);
}
else
{
uint32 y_offs = 0;
#ifdef USE_64_BIT_TXR_XFER
! unsigned short *dst = (unsigned short *)txr_base_ex;
unsigned char *src = &screen[0];
***************
*** 365,368 ****
--- 350,354 ----
}
#else
+ uint32 x_offs = 0;
for(y_offs = 0; y_offs < vdp_vislines; y_offs++)
{
***************
*** 373,392 ****
}
#ifdef USE_TWIDDLED_TXR
! ta_poly_hdr_txr(&poly, TA_TRANSLUCENT, TA_RGB565_TWID, 512, 512, txr_base_ex, TA_BILINEAR_FILTER);
! txr_twiddle_copy(&screen_ex[0], 512, 512, txr_base_ex, 512, 512, pals[0]);
#else
! memcpy4(txr_ptr_ex, &screen_ex[0], 512*512*2);
#endif // USE_TWIDDLED_TXR
#endif // USE_64_BIT_TXR_XFER
- ta_poly_hdr_txr(&poly, TA_TRANSLUCENT, TA_RGB565, 512, 512, txr_base_ex, TA_BILINEAR_FILTER);
}
! ta_begin_render();
pvr_dummy_poly(TA_OPAQUE);
! ta_commit_eol();
pvr_dummy_poly(TA_TRANSLUCENT);
! ta_commit_poly_hdr(&poly);
! vert.flags = TA_VERTEX_NORMAL;
! vert.a = vert.r = vert.g = vert.b = 1.0f;
! vert.oa = vert.or = vert.og = vert.ob = 0.0f;
vert.z = 256.0f;
vert.x = x;
--- 359,386 ----
}
#ifdef USE_TWIDDLED_TXR
! pvr_txr_load_twiddle(&screen_ex[0], txr_base_ex, 512, 512);
#else
! memcpy4(txr_base_ex, &screen_ex[0], 512*512*2);
#endif // USE_TWIDDLED_TXR
#endif // USE_64_BIT_TXR_XFER
}
! pvr_wait_ready();
! pvr_scene_begin();
! pvr_list_begin(PVR_LIST_OP_POLY);
pvr_dummy_poly(TA_OPAQUE);
! pvr_list_finish();
! pvr_list_begin(PVR_LIST_TR_POLY);
pvr_dummy_poly(TA_TRANSLUCENT);
! if(ui_rendermode == PALETTED_TXR)
! {
! pvr_prim(&screen_poly_pal, sizeof(screen_poly_pal));
! }
! else
! {
! pvr_prim(&screen_poly, sizeof(screen_poly));
! }
! vert.flags = PVR_CMD_VERTEX;
! vert.argb = PVR_PACK_COLOR(1,1,1,1);
! vert.oargb = PVR_PACK_COLOR(0,0,0,0);
vert.z = 256.0f;
vert.x = x;
***************
*** 394,442 ****
vert.u = 0;
vert.v = vdp_vislines/512.0f;
! ta_commit_vertex(&vert, sizeof(vert));
vert.x = x;
vert.y = y;
vert.u = 0;
vert.v = 0;
! ta_commit_vertex(&vert, sizeof(vert));
vert.x = x + x_size;
vert.y = y + y_size;
vert.u = u_max/512.0f;
vert.v = vdp_vislines/512.0f;
! ta_commit_vertex(&vert, sizeof(vert));
vert.x = x + x_size;
vert.y = y;
vert.u = u_max/512.0f;
vert.v = 0;
! ta_commit_vertex(&vert, sizeof(vert));
! ta_commit_eol();
! ta_finish_frame();
}
/*** logging functions ***/
! /* logging is done this way because this was the best I could come up with
! whilst battling with macros that can only take fixed numbers of arguments */
! #define LOG_FUNC(name,level,txt) void ui_log_ ## name ## (const char *text, ...) \
! { \
! va_list ap; \
! char msg[512]; \
! if (gen_loglevel >= level) { \
! va_start(ap, text); \
! vsprintf((char *)msg, text, ap); \
! va_end(ap); \
! printf("%s (%05X) %s\n", txt, cpu68k_clocks, msg); \
! } \
}
! LOG_FUNC(debug3, 7, "DEBG ");
! LOG_FUNC(debug2, 6, "DEBG ");
! LOG_FUNC(debug1, 5, "DEBG ");
! LOG_FUNC(user, 4, "USER ");
! LOG_FUNC(verbose, 3, "---- ");
! LOG_FUNC(normal, 2, "---- ");
! LOG_FUNC(critical, 1, "CRIT ");
! LOG_FUNC(request, 0, "---- ");
/*** ui_err - log error message and quit ***/
--- 388,509 ----
vert.u = 0;
vert.v = vdp_vislines/512.0f;
! pvr_prim(&vert, sizeof(vert));
vert.x = x;
vert.y = y;
vert.u = 0;
vert.v = 0;
! pvr_prim(&vert, sizeof(vert));
vert.x = x + x_size;
vert.y = y + y_size;
vert.u = u_max/512.0f;
vert.v = vdp_vislines/512.0f;
! pvr_prim(&vert, sizeof(vert));
! vert.flags = PVR_CMD_VERTEX_EOL;
vert.x = x + x_size;
vert.y = y;
vert.u = u_max/512.0f;
vert.v = 0;
! pvr_prim(&vert, sizeof(vert));
! pvr_list_finish();
! pvr_scene_finish();
}
+
/*** logging functions ***/
+ void ui_log_debug3(const char *text, ...)
+ {
+ va_list ap;
+ char msg[512];
+ if (gen_loglevel >= 7) {
+ va_start(ap, text);
+ vsprintf((char *)msg, text, ap);
+ va_end(ap);
+ printf("DEBG (%05X) %s\n", cpu68k_clocks, msg);
+ }
+ }
! void ui_log_debug2(const char *text, ...)
! {
! va_list ap;
! char msg[512];
! if (gen_loglevel >= 6) {
! va_start(ap, text);
! vsprintf((char *)msg, text, ap);
! va_end(ap);
! printf("DEBG (%05X) %s\n", cpu68k_clocks, msg);
! }
! }
! void ui_log_debug1(const char *text, ...)
! {
! va_list ap;
! char msg[512];
! if (gen_loglevel >= 5) {
! va_start(ap, text);
! vsprintf((char *)msg, text, ap);
! va_end(ap);
! printf("DEBG (%05X) %s\n", cpu68k_clocks, msg);
! }
}
! void ui_log_user(const char *text, ...)
! {
! va_list ap;
! char msg[512];
! if (gen_loglevel >= 4) {
! va_start(ap, text);
! vsprintf((char *)msg, text, ap);
! va_end(ap);
! printf("USER (%05X) %s\n", cpu68k_clocks, msg);
! }
! }
!
! void ui_log_verbose(const char *text, ...)
! {
! va_list ap;
! char msg[512];
! if (gen_loglevel >= 3) {
! va_start(ap, text);
! vsprintf((char *)msg, text, ap);
! va_end(ap);
! printf("---- (%05X) %s\n", cpu68k_clocks, msg);
! }
! }
!
! void ui_log_normal(const char *text, ...)
! {
! va_list ap;
! char msg[512];
! if (gen_loglevel >= 2) {
! va_start(ap, text);
! vsprintf((char *)msg, text, ap);
! va_end(ap);
! printf("---- (%05X) %s\n", cpu68k_clocks, msg);
! }
! }
!
! void ui_log_critical(const char *text, ...)
! {
! va_list ap;
! char msg[512];
! if (gen_loglevel >= 1) {
! va_start(ap, text);
! vsprintf((char *)msg, text, ap);
! va_end(ap);
! printf("CRIT (%05X) %s\n", cpu68k_clocks, msg);
! }
! }
!
! void ui_log_request(const char *text, ...)
! {
! va_list ap;
! char msg[512];
! if (gen_loglevel) {
! va_start(ap, text);
! vsprintf((char *)msg, text, ap);
! va_end(ap);
! printf("---- (%05X) %s\n", cpu68k_clocks, msg);
! }
! }
/*** ui_err - log error message and quit ***/
|
|
From: Mike D. <at...@us...> - 2002-02-10 22:41:09
|
Update of /cvsroot/atsoft/dcgen In directory usw-pr-cvs1:/tmp/cvs-serv30551 Modified Files: Makefile.prefab Log Message: This is the preliminary pvr_* API upgrade. There are known issues with this new port. Most notably is that palettes now work again but the colors are totally wrong (again?) and when using non-paletted txrs the screen shifts left by about 40 pixels or so... DP is looking into fixing this in KOS soon. Index: Makefile.prefab =================================================================== RCS file: /cvsroot/atsoft/dcgen/Makefile.prefab,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.prefab 26 Jan 2002 03:51:44 -0000 1.1 --- Makefile.prefab 10 Feb 2002 22:41:06 -0000 1.2 *************** *** 29,34 **** -rm *~ - include $(KOS_BASE)/Makefile.rules KOS_LOCAL_CFLAGS = -I$(DCGEN_BASE)/hdr -I$(DCGEN_BASE)/mz80 -I$(DCGEN_BASE)/cpu68k -I$(DCGEN_BASE) -I$(DCGEN_BASE)/ym2612 -I$(DCGEN_BASE)/sn76496 -DDREAMCAST=1 --- 29,35 ---- -rm *~ KOS_LOCAL_CFLAGS = -I$(DCGEN_BASE)/hdr -I$(DCGEN_BASE)/mz80 -I$(DCGEN_BASE)/cpu68k -I$(DCGEN_BASE) -I$(DCGEN_BASE)/ym2612 -I$(DCGEN_BASE)/sn76496 -DDREAMCAST=1 + + include $(KOS_BASE)/Makefile.rules |
|
From: Mike D. <at...@us...> - 2002-02-09 06:35:48
|
Update of /cvsroot/atsoft/dcgen/mz80 In directory usw-pr-cvs1:/tmp/cvs-serv6895 Modified Files: Makefile Log Message: Fixing a typo in the makefile Index: Makefile =================================================================== RCS file: /cvsroot/atsoft/dcgen/mz80/Makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile 26 Jan 2002 03:51:44 -0000 1.3 --- Makefile 9 Feb 2002 06:35:45 -0000 1.4 *************** *** 8,12 **** makez80_exe: ! gcc -o makez80 -I../hdr -I../ -DNOS_KOS_COMPILE=1 makez80.c ./makez80 z80.c -c touch makez80_exe --- 8,12 ---- makez80_exe: ! gcc -o makez80 -I../hdr -I../ -DNOT_KOS_COMPILE=1 makez80.c ./makez80 z80.c -c touch makez80_exe |