From 351c4812d3c1db4a33cd6f2c166456d6b0b757e0 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Thu, 23 Jul 2015 08:40:10 -0500 Subject: [PATCH 1/1] ^^ modified: fmemtest.exe modified: src/fmemtest.c modified: src/lib/16text.c renamed: src/text.h -> src/lib/16text.h deleted: src/text.c --- fmemtest.exe | Bin 21638 -> 22163 bytes src/fmemtest.c | 16 +++++++++++---- src/lib/16text.c | 22 +++++++++++++++++++++ src/lib/16text.h | 23 ++++++++++++++++++++++ src/text.c | 59 ------------------------------------------------------- src/text.h | 52 ------------------------------------------------ 6 files changed, 57 insertions(+), 115 deletions(-) delete mode 100644 src/text.c delete mode 100644 src/text.h diff --git a/fmemtest.exe b/fmemtest.exe index 05eaa8a81f6154f7b5b6dadc9be076397b1f0232..dd8b328ada3f1de91a6a84d8241c7b3db6306173 100644 GIT binary patch delta 9630 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 delta 9583 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 diff --git a/src/fmemtest.c b/src/fmemtest.c index af61ffe2..2cdbadd0 100644 --- a/src/fmemtest.c +++ b/src/fmemtest.c @@ -31,12 +31,17 @@ main(int argc, char *argv[]) int x=420; int huge *ptr=&x; int *ptr0=&x; - void __based(__self) *pee; + //void __based(__self) *pee; + memptr pee; void __near *npee; - memptr bigbuffer; + void __far *fpee; + void *dpee; __segment segu; //word csw=0,dsw=0,esw=0,ssw=0,ipw=0; + _nheapgrow(); + _fheapgrow(); + _heapgrow(); //ptr=&x; printf("&main()=%Fp\n", *argv[0]); printf("ptr0=%Fp\n", ptr0); @@ -62,8 +67,11 @@ main(int argc, char *argv[]) //printf("cs=%u\n", csw); //printf("ds=%u\n", dsw); //printf("es=%u\n", esw); - printf("size of big buffer~=%u\n", _bmsize(segu, bigbuffer)); - printf("size of pee~=%u\n", _bmsize(segu, pee)); + printf("memavl=%u\n", _memavl()); + printf("size of based pee~=%u %FP\n", _bmsize(segu, pee), pee); + printf("size of default pee~=%u %FP\n", _msize(dpee), dpee); + printf("size of near pee~=%u %FP\n", _nmsize(npee), npee); + printf("size of far pee~=%u %FP\n", _fmsize(fpee), fpee); printf("pee=%Fp\n", pee); printf("npee=%Fp\n", npee); printf("&main()=%Fp\n", *argv[0]); diff --git a/src/lib/16text.c b/src/lib/16text.c index 59420b5c..fc7c775f 100644 --- a/src/lib/16text.c +++ b/src/lib/16text.c @@ -1,3 +1,25 @@ +/* Project 16 Source Code~ + * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669 + * + * This file is part of Project 16. + * + * Project 16 is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * Project 16 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see , or + * write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + #include "16text.h" /* this array holds the rom font descriptors */ diff --git a/src/lib/16text.h b/src/lib/16text.h index 9f0034e4..a4453739 100644 --- a/src/lib/16text.h +++ b/src/lib/16text.h @@ -1,3 +1,24 @@ +/* Project 16 Source Code~ + * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669 + * + * This file is part of Project 16. + * + * Project 16 is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * Project 16 is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see , or + * write to the Free Software Foundation, Inc., 51 Franklin Street, + * Fifth Floor, Boston, MA 02110-1301 USA. + * + */ /* * This is the text subsystem for project 16. * These functions provide for the rendering of text strings @@ -6,8 +27,10 @@ */ #ifndef TEXT_H #define TEXT_H +#ifdef __WATCOMC__ #include #include +#endif #include "src/lib/types.h" /* font information type */ diff --git a/src/text.c b/src/text.c deleted file mode 100644 index 5101c545..00000000 --- a/src/text.c +++ /dev/null @@ -1,59 +0,0 @@ -/* Project 16 Source Code~ - * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669 - * - * This file is part of Project 16. - * - * Project 16 is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * Project 16 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see , or - * write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301 USA. - * - */ - -#include "text.h" - -/* this array holds the rom font descriptors */ -font_t romFonts[4]; - - -static void getRomFontAddr(char fontNum, int index) { - word fontSeg; - word fontOff; - - __asm { - PUSH BP - MOV AX, 0x1130 ;I can haz font info plz? - MOV BH, fontNum ; where ur fontNum - INT 0x10 ;kthxbae - MOV AX, ES ;save teh segmentz - MOV BX, BP ;and all the base! - POP BP ;u can haz ur frame back! - MOV fontSeg, AX ;Storage - MOV fontOff, BX ;Storage - } - romFonts[index].seg = fontSeg; - romFonts[index].off = fontOff; - -} - -/* This function initializes the text engine */ -void textInit() { - getRomFontAddr(0x02, ROM_FONT_8x14); - getRomFontAddr(0x03, ROM_FONT_8x8_LOW); - getRomFontAddr(0x04, ROM_FONT_8x8_HIGH); - getRomFontAddr(0x06, ROM_FONT_8x16); - romFonts[ROM_FONT_8x14].charSize=14; - romFonts[ROM_FONT_8x8_LOW].charSize=8; - romFonts[ROM_FONT_8x8_HIGH].charSize=8; - romFonts[ROM_FONT_8x16].charSize=16; -} diff --git a/src/text.h b/src/text.h deleted file mode 100644 index 74d636f9..00000000 --- a/src/text.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Project 16 Source Code~ - * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669 - * - * This file is part of Project 16. - * - * Project 16 is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * Project 16 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see , or - * write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301 USA. - * - */ -/* - * This is the text subsystem for project 16. - * These functions provide for the rendering of text strings - * using the BIOS fonts. - * They copy the font characters directly to VGA. - */ -#ifndef TEXT_H -#define TEXT_H -#ifdef __WATCOMC__ -#include -#endif -#include "types.h" - -/* font information type */ -typedef struct font { - word seg; //segment for the font - word off; //offset in the segment for the font - byte charSize; //bytes in each character -} font_t; - -/* storage for the rom fonts */ -extern font_t romFonts[4]; -#define ROM_FONT_8x14 0 -#define ROM_FONT_8x8_LOW 1 -#define ROM_FONT_8x8_HIGH 2 -#define ROM_FONT_8x16 3 - -/* This function initializes the text engine */ -void textInit(); - -#endif -- 2.11.0