@@ -85,4 +85,5 @@ addons/*/docs/docs.txt *.mode1 *.pbxuser *.mode1v3 -extras/osxvm/build \ No newline at end of file +extras/osxvm/build +*~ .gitignore @@ -26,6 +26,7 @@ LINKDLLOUTFLAG := -o LINKDIRFLAG := -L LINKLIBFLAG := -l DLL_LIB_SUFFIX := +DLL_LIB_PREFIX := CCOUTFLAG := -o AROUTFLAG := RANLIB ?= ranlib @@ -50,6 +51,7 @@ endif ifneq (,$(findstring Windows,$(SYS))) CC := cl -nologo +DLL_LIB_PREFIX := LINKDLL := link LINKDLLOUTFLAG :=-out: DLL_SUFFIX := dll @@ -95,15 +97,15 @@ addons: vm vmlib: mkdir -p _build || true mkdir -p _build/dll || true - $(LINKDLL) $(DLL_COMMAND) $(LINKDLLOUTFLAG)_build/dll/libiovmall.$(DLL_SUFFIX) libs/*/_build/$(VMALL)objs/*.o $(LFLAGS) $(DLL_EXTRA_LIBS) + $(LINKDLL) $(DLL_COMMAND) $(LINKDLLOUTFLAG)_build/dll/$(DLL_LIB_PREFIX)iovmall.$(DLL_SUFFIX) libs/*/_build/$(VMALL)objs/*.o $(LFLAGS) $(DLL_EXTRA_LIBS) ifneq (,$(findstring Windows,$(SYS))) - mt.exe -manifest _build/dll/libiovmall.dll.manifest -outputresource:_build/dll/libiovmall.dll - rm _build/dll/libiovmall.dll.manifest + mt.exe -manifest _build/dll/$(DLL_LIB_PREFIX)iovmall.dll.manifest -outputresource:_build/dll/$(DLL_LIB_PREFIX)iovmall.dll + rm _build/dll/$(DLL_LIB_PREFIX)iovmall.dll.manifest endif mkdir -p _build/lib || true - $(AR) $(ARFLAGS) $(AROUTFLAG)_build/lib/libiovmall.a\ + $(AR) $(ARFLAGS) $(AROUTFLAG)_build/lib/$(DLL_LIB_PREFIX)iovmall.a\ libs/*/_build/$(VMALL)objs/*.o - $(RANLIB) _build/lib/libiovmall.a + $(RANLIB) _build/lib/$(DLL_LIB_PREFIX)iovmall.a mkdir -p _build/headers || true cp libs/*/_build/headers/* _build/headers @@ -151,8 +153,8 @@ uninstall: rm -rf $(INSTALL_PREFIX)/include/io rm -f $(INSTALL_PREFIX)/bin/io rm -f $(INSTALL_PREFIX)/bin/io_static$(BINARY_SUFFIX) - rm -f $(INSTALL_PREFIX)/bin/libiovmall.* - rm -f $(INSTALL_PREFIX)/lib/libiovmall.* + rm -f $(INSTALL_PREFIX)/bin/$(DLL_LIB_PREFIX)iovmall.* + rm -f $(INSTALL_PREFIX)/lib/$(DLL_LIB_PREFIX)iovmall.* doc: ./_build/binaries/io_static$(BINARY_SUFFIX) build.io docs Makefile @@ -19,6 +19,7 @@ LINKDLL := $(CC) LINKDLLOUTFLAG := -o LINKDIRFLAG := -L LINKLIBFLAG := -l +INSTALL_PREFIX_DEFINE := $(INSTALL_PREFIX) # may need to remove --param max-inline-insns-single=500 for older versions of gccs WARN :=-Wstrict-prototypes @@ -90,7 +91,7 @@ CC := cl -nologo CCOUTFLAG :=-Fo WARN := #OPTIMIZE :=-Zi -MDd -D_USE_MATH_DEFINES -DWIN32 -D_DEBUG -D_CRT_SECURE_NO_DEPRECATE -OPTIMIZE :=-Zi -MD -D_USE_MATH_DEFINES -DWIN32 -DNDEBUG -D_CRT_SECURE_NO_DEPRECATE +OPTIMIZE :=-O2 -EHsc -MD -D_USE_MATH_DEFINES -DWIN32 -DNDEBUG -D_CRT_SECURE_NO_DEPRECATE AR := link -lib AROUTFLAG :=-out: ARFLAGS := @@ -104,6 +105,7 @@ DLL_SUFFIX := dll DLL_EXTRAS := ws2_32.lib shell32.lib FLAT_NAMESPACE := RANLIB := echo no ranlib +INSTALL_PREFIX_DEFINE := $(shell cygpath -am $(INSTALL_PREFIX)) endif ### FILES ######################################################### @@ -168,11 +170,13 @@ _build/dll: _build -include $(objects:.o=.d) _build/objs/%.o: source/%.c - $(CC) -MM -MT $@ -MF $(@:.o=.d) -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" $(CFLAGS) -c $< $(CCOUTFLAG)$@ - $(CC) -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" $(CFLAGS) -c $< $(CCOUTFLAG)$@ +ifeq (,$(findstring Windows,$(SYS))) + $(CC) -MM -MT $@ -MF $(@:.o=.d) -DINSTALL_PREFIX=\"$(INSTALL_PREFIX_DEFINE)\" $(CFLAGS) -c $< $(CCOUTFLAG)$@ +endif + $(CC) -DINSTALL_PREFIX=\"$(INSTALL_PREFIX_DEFINE)\" $(CFLAGS) -c $< $(CCOUTFLAG)$@ _build/vmall_objs/%.o: source/%.c - $(CC) -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" $(CFLAGS) \ + $(CC) -DINSTALL_PREFIX=\"$(INSTALL_PREFIX_DEFINE)\" $(CFLAGS) \ -DBUILDING_IOVMALL_DLL -c $< $(CCOUTFLAG)$@ _build/headers/%.h: source/%.h _build/headers Makefile.lib @@ -489,13 +489,15 @@ void Image_makeRGBA(Image *self) } else if (self->componentCount == 1) { - UArray *outUArray = UArray_new(); - UArray_setSize_(outUArray, 4 * self->width * self->height); - uint8_t *outData = (uint8_t *)UArray_bytes(outUArray); - uint8_t *inData = (uint8_t *)UArray_bytes(self->byteArray); size_t numPixels = self->width * self->height; size_t p1; size_t p2 = 0; + uint8_t *outData; + uint8_t *inData; + UArray *outUArray = UArray_new(); + UArray_setSize_(outUArray, 4 * self->width * self->height); + *outData = (uint8_t *)UArray_bytes(outUArray); + *inData = (uint8_t *)UArray_bytes(self->byteArray); for (p1 = 0; p1 < numPixels; p1 ++) { @@ -642,4 +644,4 @@ ColorStruct Image_averageColor(Image *self) //printf("color struct %i %i %i\n", s.r, s.g, s.b); return s; -} \ No newline at end of file +} addons/Image/source/Image.c @@ -12,8 +12,9 @@ AddonBuilder := Object clone do( ccOutFlag := "-Fo" linkdll := "link -link -nologo" linkDirPathFlag := "-libpath:" - linkLibFlag := "lib" + linkLibFlag := "" linkOutFlag := "-out:" + linkLibPrefix := "" linkLibSuffix := ".lib" ar := "link -lib -nologo" arFlags := "-out:" @@ -25,6 +26,7 @@ AddonBuilder := Object clone do( linkdll := cc linkDirPathFlag := "-L" linkLibFlag := "-l" + linkLibPrefix := "lib" linkLibSuffix := "" linkOutFlag := "-o " linkLibSuffix := "" @@ -299,7 +301,7 @@ AddonBuilder := Object clone do( links := depends addons map(b, linkDirPathFlag .. "../" .. b .. "/_build/dll") - links appendSeq(depends addons map(v, linkLibFlag .. "Io" .. v .. linkLibSuffix)) + links appendSeq(depends addons map(v, linkLibFlag .. linkLibPrefix .. "Io" .. v .. linkLibSuffix)) if(platform == "windows", links appendSeq(depends syslibs map(v, v .. ".lib")) ) @@ -307,8 +309,8 @@ AddonBuilder := Object clone do( links appendSeq(depends addons map(v, "-Wl,--rpath -Wl," .. System installPrefix .. "/lib/io/addons/" .. v .. "/_build/dll/")) ) links appendSeq(libSearchPaths map(v, linkDirPathFlag .. v)) - links appendSeq(depends libs map(v, linkLibFlag .. v .. linkLibSuffix)) - links appendSeq(list(linkDirPathFlag .. "../../_build/dll", linkLibFlag .. "iovmall" .. linkLibSuffix)) + links appendSeq(depends libs map(v, linkLibFlag .. linkLibPrefix .. v .. linkLibSuffix)) + links appendSeq(list(linkDirPathFlag .. "../../_build/dll", linkLibFlag .. linkLibPrefix .. "iovmall" .. linkLibSuffix)) links appendSeq(depends frameworks map(v, "-framework " .. v)) links appendSeq(depends linkOptions) build/AddonBuilder.io @@ -19,6 +19,7 @@ LINKDLL := $(CC) LINKDLLOUTFLAG := -o LINKDIRFLAG := -L LINKLIBFLAG := -l +INSTALL_PREFIX_DEFINE := $(INSTALL_PREFIX) # may need to remove --param max-inline-insns-single=500 for older versions of gccs WARN :=-Wstrict-prototypes @@ -90,20 +91,22 @@ CC := cl -nologo CCOUTFLAG :=-Fo WARN := #OPTIMIZE :=-Zi -MDd -D_USE_MATH_DEFINES -DWIN32 -D_DEBUG -D_CRT_SECURE_NO_DEPRECATE -OPTIMIZE :=-Zi -MD -D_USE_MATH_DEFINES -DWIN32 -DNDEBUG -D_CRT_SECURE_NO_DEPRECATE +OPTIMIZE :=-O2 -EHsc -MD -D_USE_MATH_DEFINES -DWIN32 -DNDEBUG -D_CRT_SECURE_NO_DEPRECATE AR := link -lib AROUTFLAG :=-out: ARFLAGS := LINKDLL := link LINKDLLOUTFLAG :=-out: LINKDIRFLAG := -libpath: -LINKLIBFLAG := lib +LINKLIBFLAG := DLL_LIB_SUFFIX := .lib +DLL_LIB_PREFIX := DLL_COMMAND := -link /INCREMENTAL:NO -subsystem:WINDOWS -machine:X86 -DLL $(DEF_FILE) DLL_SUFFIX := dll DLL_EXTRAS := ws2_32.lib shell32.lib FLAT_NAMESPACE := RANLIB := echo no ranlib +INSTALL_PREFIX_DEFINE := $(shell cygpath -am $(INSTALL_PREFIX)) endif ### FILES ######################################################### @@ -168,11 +171,13 @@ _build/dll: _build -include $(objects:.o=.d) _build/objs/%.o: source/%.c - $(CC) -MM -MT $@ -MF $(@:.o=.d) -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" $(CFLAGS) -c $< $(CCOUTFLAG)$@ - $(CC) -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" $(CFLAGS) -c $< $(CCOUTFLAG)$@ +ifeq (,$(findstring Windows,$(SYS))) + $(CC) -MM -MT $@ -MF $(@:.o=.d) -DINSTALL_PREFIX=\"$(INSTALL_PREFIX_DEFINE)\" $(CFLAGS) -c $< $(CCOUTFLAG)$@ +endif + $(CC) -DINSTALL_PREFIX=\"$(INSTALL_PREFIX_DEFINE)\" $(CFLAGS) -c $< $(CCOUTFLAG)$@ _build/vmall_objs/%.o: source/%.c - $(CC) -DINSTALL_PREFIX=\"$(INSTALL_PREFIX)\" $(CFLAGS) \ + $(CC) -DINSTALL_PREFIX=\"$(INSTALL_PREFIX_DEFINE)\" $(CFLAGS) \ -DBUILDING_IOVMALL_DLL -c $< $(CCOUTFLAG)$@ _build/headers/%.h: source/%.h _build/headers libs/basekit/Makefile.lib @@ -6,7 +6,7 @@ #include "Common.h" #include <stddef.h> -#include <stdint.h> +#include "PortableStdint.h" #ifdef __cplusplus extern "C" { libs/basekit/source/CHash.h @@ -9,6 +9,7 @@ The List is not responsible for io_freeing it's elements. #define IO_IN_C_FILE #endif #include "Common_inline.h" +#include "PortableSorting.h" #ifdef IO_DECLARE_INLINES #define LIST_FOREACH(list, index, value, code) \ libs/basekit/source/List_inline.h @@ -12,7 +12,7 @@ #include "Common.h" #include <stddef.h> -#include <stdint.h> +#include "PortableStdint.h" #ifdef __cplusplus extern "C" { libs/basekit/source/PointerHash.h @@ -6,7 +6,7 @@ typedef struct size_t size; size_t width; void *context; - PortableSortingCompareCallback *compare; + PortableSortingCompareCallback compare; unsigned char *swapSpace; } Sorter; @@ -14,7 +14,7 @@ void Sorter_quickSort(Sorter *self, size_t lb, size_t ub); int Sorter_quickSortRearrange(Sorter *self, size_t lb, size_t ub); void portable_qsort_r(void *base, size_t size, size_t width, - void *context, PortableSortingCompareCallback *compare) + void *context, PortableSortingCompareCallback compare) { if (size > 0 && width > 0) { @@ -57,7 +57,7 @@ static void swap(void *base, size_t a, size_t b, size_t width, unsigned char *sw int Sorter_quickSortRearrange(Sorter *self, size_t lb, size_t ub) { - PortableSortingCompareCallback *comp = self->compare; + PortableSortingCompareCallback comp = self->compare; void *context = self->context; unsigned char *base = self->base; size_t width = self->width; libs/basekit/source/PortableSorting.c @@ -16,10 +16,10 @@ extern "C" { //typedef int (ListSortRCallback)(void *, const void *, const void *); -typedef int (PortableSortingCompareCallback)(void *context, const void *a, const void *b); +typedef int (*PortableSortingCompareCallback)(void *context, const void *a, const void *b); -void portable_qsort_r(void *base, size_t nel, size_t width, - void *context, PortableSortingCompareCallback *compare); +BASEKIT_API void portable_qsort_r(void *base, size_t nel, size_t width, + void *context, PortableSortingCompareCallback compare); #ifdef __cplusplus } libs/basekit/source/PortableSorting.h @@ -1,106 +1,799 @@ -/*- - * Copyright (c) 2001 Mike Barcroft <mike@FreeBSD.org> - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD: src/sys/sys/stdint.h,v 1.4 2002/08/21 16:20:01 mike Exp $ +/* A portable stdint.h + **************************************************************************** + * BSD License: + **************************************************************************** + * + * Copyright (c) 2005-2007 Paul Hsieh + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + **************************************************************************** + * + * Version 0.1.11 + * + * The ANSI C standard committee, for the C99 standard, specified the + * inclusion of a new standard include file called stdint.h. This is + * a very useful and long desired include file which contains several + * very precise definitions for integer scalar types that is + * critically important for making portable several classes of + * applications including cryptography, hashing, variable length + * integer libraries and so on. But for most developers its likely + * useful just for programming sanity. + * + * The problem is that most compiler vendors have decided not to + * implement the C99 standard, and the next C++ language standard + * (which has a lot more mindshare these days) will be a long time in + * coming and its unknown whether or not it will include stdint.h or + * how much adoption it will have. Either way, it will be a long time + * before all compilers come with a stdint.h and it also does nothing + * for the extremely large number of compilers available today which + * do not include this file, or anything comparable to it. + * + * So that's what this file is all about. Its an attempt to build a + * single universal include file that works on as many platforms as + * possible to deliver what stdint.h is supposed to. A few things + * that should be noted about this file: + * + * 1) It is not guaranteed to be portable and/or present an identical + * interface on all platforms. The extreme variability of the + * ANSI C standard makes this an impossibility right from the + * very get go. Its really only meant to be useful for the vast + * majority of platforms that possess the capability of + * implementing usefully and precisely defined, standard sized + * integer scalars. Systems which are not intrinsically 2s + * complement may produce invalid constants. + * + * 2) There is an unavoidable use of non-reserved symbols. + * + * 3) Other standard include files are invoked. + * + * 4) This file may come in conflict with future platforms that do + * include stdint.h. The hope is that one or the other can be + * used with no real difference. + * + * 5) In the current verison, if your platform can't represent + * int32_t, int16_t and int8_t, it just dumps out with a compiler + * error. + * + * 6) 64 bit integers may or may not be defined. Test for their + * presence with the test: #ifdef INT64_MAX or #ifdef UINT64_MAX. + * Note that this is different from the C99 specification which + * requires the existence of 64 bit support in the compiler. If + * this is not defined for your platform, yet it is capable of + * dealing with 64 bits then it is because this file has not yet + * been extended to cover all of your system's capabilities. + * + * 7) (u)intptr_t may or may not be defined. Test for its presence + * with the test: #ifdef PTRDIFF_MAX. If this is not defined + * for your platform, then it is because this file has not yet + * been extended to cover all of your system's capabilities, not + * because its optional. + * + * 8) The following might not been defined even if your platform is + * capable of defining it: + * + * WCHAR_MIN + * WCHAR_MAX + * (u)int64_t + * PTRDIFF_MIN + * PTRDIFF_MAX + * (u)intptr_t + * + * 9) The following have not been defined: + * + * WINT_MIN + * WINT_MAX + * + * 10) The criteria for defining (u)int_least(*)_t isn't clear, + * except for systems which don't have a type that precisely + * defined 8, 16, or 32 bit types (which this include file does + * not support anyways). Default definitions have been given. + * + * 11) The criteria for defining (u)int_fast(*)_t isn't something I + * would trust to any particular compiler vendor or the ANSI C + * committee. It is well known that "compatible systems" are + * commonly created that have very different performance + * characteristics from the systems they are compatible with, + * especially those whose vendors make both the compiler and the + * system. Default definitions have been given, but its strongly + * recommended that users never use these definitions for any + * reason (they do *NOT* deliver any serious guarantee of + * improved performance -- not in this file, nor any vendor's + * stdint.h). + * + * 12) The following macros: + * + * PRINTF_INTMAX_MODIFIER + * PRINTF_INT64_MODIFIER + * PRINTF_INT32_MODIFIER + * PRINTF_INT16_MODIFIER + * PRINTF_LEAST64_MODIFIER + * PRINTF_LEAST32_MODIFIER + * PRINTF_LEAST16_MODIFIER + * PRINTF_INTPTR_MODIFIER + * + * are strings which have been defined as the modifiers required + * for the "d", "u" and "x" printf formats to correctly output + * (u)intmax_t, (u)int64_t, (u)int32_t, (u)int16_t, (u)least64_t, + * (u)least32_t, (u)least16_t and (u)intptr_t types respectively. + * PRINTF_INTPTR_MODIFIER is not defined for some systems which + * provide their own stdint.h. PRINTF_INT64_MODIFIER is not + * defined if INT64_MAX is not defined. These are an extension + * beyond what C99 specifies must be in stdint.h. + * + * In addition, the following macros are defined: + * + * PRINTF_INTMAX_HEX_WIDTH + * PRINTF_INT64_HEX_WIDTH + * PRINTF_INT32_HEX_WIDTH + * PRINTF_INT16_HEX_WIDTH + * PRINTF_INT8_HEX_WIDTH + * PRINTF_INTMAX_DEC_WIDTH + * PRINTF_INT64_DEC_WIDTH + * PRINTF_INT32_DEC_WIDTH + * PRINTF_INT16_DEC_WIDTH + * PRINTF_INT8_DEC_WIDTH + * + * Which specifies the maximum number of characters required to + * print the number of that type in either hexadecimal or decimal. + * These are an extension beyond what C99 specifies must be in + * stdint.h. + * + * Compilers tested (all with 0 warnings at their highest respective + * settings): Borland Turbo C 2.0, WATCOM C/C++ 11.0 (16 bits and 32 + * bits), Microsoft Visual C++ 6.0 (32 bit), Microsoft Visual Studio + * .net (VC7), Intel C++ 4.0, GNU gcc v3.3.3 + * + * This file should be considered a work in progress. Suggestions for + * improvements, especially those which increase coverage are strongly + * encouraged. + * + * Acknowledgements + * + * The following people have made significant contributions to the + * development and testing of this file: + * + * Chris Howie + * John Steele Scott + * Dave Thorup + * + */ + +#include <stddef.h> +#include <limits.h> +#include <signal.h> + +/* + * For gcc with _STDINT_H, fill in the PRINTF_INT*_MODIFIER macros, and + * do nothing else. On the Mac OS X version of gcc this is _STDINT_H_. + */ + +#if ((defined(__STDC__) && __STDC__ && __STDC_VERSION__ >= 199901L) || (defined (__WATCOMC__) && (defined (_STDINT_H_INCLUDED) || __WATCOMC__ >= 1250)) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) )) && !defined (_PSTDINT_H_INCLUDED) +#include <stdint.h> +#define _PSTDINT_H_INCLUDED +# ifndef PRINTF_INT64_MODIFIER +# define PRINTF_INT64_MODIFIER "ll" +# endif +# ifndef PRINTF_INT32_MODIFIER +# define PRINTF_INT32_MODIFIER "l" +# endif +# ifndef PRINTF_INT16_MODIFIER +# define PRINTF_INT16_MODIFIER "h" +# endif +# ifndef PRINTF_INTMAX_MODIFIER +# define PRINTF_INTMAX_MODIFIER PRINTF_INT64_MODIFIER +# endif +# ifndef PRINTF_INT64_HEX_WIDTH +# define PRINTF_INT64_HEX_WIDTH "16" +# endif +# ifndef PRINTF_INT32_HEX_WIDTH +# define PRINTF_INT32_HEX_WIDTH "8" +# endif +# ifndef PRINTF_INT16_HEX_WIDTH +# define PRINTF_INT16_HEX_WIDTH "4" +# endif +# ifndef PRINTF_INT8_HEX_WIDTH +# define PRINTF_INT8_HEX_WIDTH "2" +# endif +# ifndef PRINTF_INT64_DEC_WIDTH +# define PRINTF_INT64_DEC_WIDTH "20" +# endif +# ifndef PRINTF_INT32_DEC_WIDTH +# define PRINTF_INT32_DEC_WIDTH "10" +# endif +# ifndef PRINTF_INT16_DEC_WIDTH +# define PRINTF_INT16_DEC_WIDTH "5" +# endif +# ifndef PRINTF_INT8_DEC_WIDTH +# define PRINTF_INT8_DEC_WIDTH "3" +# endif +# ifndef PRINTF_INTMAX_HEX_WIDTH +# define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT64_HEX_WIDTH +# endif +# ifndef PRINTF_INTMAX_DEC_WIDTH +# define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT64_DEC_WIDTH +# endif + +/* + * Something really weird is going on with Open Watcom. Just pull some of + * these duplicated definitions from Open Watcom's stdint.h file for now. + */ + +# if defined (__WATCOMC__) && __WATCOMC__ >= 1250 +# if !defined (INT64_C) +# define INT64_C(x) (x + (INT64_MAX - INT64_MAX)) +# endif +# if !defined (UINT64_C) +# define UINT64_C(x) (x + (UINT64_MAX - UINT64_MAX)) +# endif +# if !defined (INT32_C) +# define INT32_C(x) (x + (INT32_MAX - INT32_MAX)) +# endif +# if !defined (UINT32_C) +# define UINT32_C(x) (x + (UINT32_MAX - UINT32_MAX)) +# endif +# if !defined (INT16_C) +# define INT16_C(x) (x) +# endif +# if !defined (UINT16_C) +# define UINT16_C(x) (x) +# endif +# if !defined (INT8_C) +# define INT8_C(x) (x) +# endif +# if !defined (UINT8_C) +# define UINT8_C(x) (x) +# endif +# if !defined (UINT64_MAX) +# define UINT64_MAX 18446744073709551615ULL +# endif +# if !defined (INT64_MAX) +# define INT64_MAX 9223372036854775807LL +# endif +# if !defined (UINT32_MAX) +# define UINT32_MAX 4294967295UL +# endif +# if !defined (INT32_MAX) +# define INT32_MAX 2147483647L +# endif +# if !defined (INTMAX_MAX) +# define INTMAX_MAX INT64_MAX +# endif +# if !defined (INTMAX_MIN) +# define INTMAX_MIN INT64_MIN +# endif +# endif +#endif + +#ifndef _PSTDINT_H_INCLUDED +#define _PSTDINT_H_INCLUDED + +#ifndef SIZE_MAX +# define SIZE_MAX (~(size_t)0) +#endif + +/* + * Deduce the type assignments from limits.h under the assumption that + * integer sizes in bits are powers of 2, and follow the ANSI + * definitions. + */ + +#ifndef UINT8_MAX +# define UINT8_MAX 0xff +#endif +#ifndef uint8_t +# if (UCHAR_MAX == UINT8_MAX) || defined (S_SPLINT_S) + typedef unsigned char uint8_t; +# define UINT8_C(v) ((uint8_t) v) +# else +# error "Platform not supported" +# endif +#endif + +#ifndef INT8_MAX +# define INT8_MAX 0x7f +#endif +#ifndef INT8_MIN +# define INT8_MIN INT8_C(0x80) +#endif +#ifndef int8_t +# if (SCHAR_MAX == INT8_MAX) || defined (S_SPLINT_S) + typedef signed char int8_t; +# define INT8_C(v) ((int8_t) v) +# else +# error "Platform not supported" +# endif +#endif + +#ifndef UINT16_MAX +# define UINT16_MAX 0xffff +#endif +#ifndef uint16_t +#if (UINT_MAX == UINT16_MAX) || defined (S_SPLINT_S) + typedef unsigned int uint16_t; +# ifndef PRINTF_INT16_MODIFIER +# define PRINTF_INT16_MODIFIER "" +# endif +# define UINT16_C(v) ((uint16_t) (v)) +#elif (USHRT_MAX == UINT16_MAX) + typedef unsigned short uint16_t; +# define UINT16_C(v) ((uint16_t) (v)) +# ifndef PRINTF_INT16_MODIFIER +# define PRINTF_INT16_MODIFIER "h" +# endif +#else +#error "Platform not supported" +#endif +#endif + +#ifndef INT16_MAX +# define INT16_MAX 0x7fff +#endif +#ifndef INT16_MIN +# define INT16_MIN INT16_C(0x8000) +#endif +#ifndef int16_t +#if (INT_MAX == INT16_MAX) || defined (S_SPLINT_S) + typedef signed int int16_t; +# define INT16_C(v) ((int16_t) (v)) +# ifndef PRINTF_INT16_MODIFIER +# define PRINTF_INT16_MODIFIER "" +# endif +#elif (SHRT_MAX == INT16_MAX) + typedef signed short int16_t; +# define INT16_C(v) ((int16_t) (v)) +# ifndef PRINTF_INT16_MODIFIER +# define PRINTF_INT16_MODIFIER "h" +# endif +#else +#error "Platform not supported" +#endif +#endif + +#ifndef UINT32_MAX +# define UINT32_MAX (0xffffffffUL) +#endif +#ifndef uint32_t +#if (ULONG_MAX == UINT32_MAX) || defined (S_SPLINT_S) + typedef unsigned long uint32_t; +# define UINT32_C(v) v ## UL +# ifndef PRINTF_INT32_MODIFIER +# define PRINTF_INT32_MODIFIER "l" +# endif +#elif (UINT_MAX == UINT32_MAX) + typedef unsigned int uint32_t; +# ifndef PRINTF_INT32_MODIFIER +# define PRINTF_INT32_MODIFIER "" +# endif +# define UINT32_C(v) v ## U +#elif (USHRT_MAX == UINT32_MAX) + typedef unsigned short uint32_t; +# define UINT32_C(v) ((unsigned short) (v)) +# ifndef PRINTF_INT32_MODIFIER +# define PRINTF_INT32_MODIFIER "" +# endif +#else +#error "Platform not supported" +#endif +#endif + +#ifndef INT32_MAX +# define INT32_MAX (0x7fffffffL) +#endif +#ifndef INT32_MIN +# define INT32_MIN INT32_C(0x80000000) +#endif +#ifndef int32_t +#if (LONG_MAX == INT32_MAX) || defined (S_SPLINT_S) + typedef signed long int32_t; +# define INT32_C(v) v ## L +# ifndef PRINTF_INT32_MODIFIER +# define PRINTF_INT32_MODIFIER "l" +# endif +#elif (INT_MAX == INT32_MAX) + typedef signed int int32_t; +# define INT32_C(v) v +# ifndef PRINTF_INT32_MODIFIER +# define PRINTF_INT32_MODIFIER "" +# endif +#elif (SHRT_MAX == INT32_MAX) + typedef signed short int32_t; +# define INT32_C(v) ((short) (v)) +# ifndef PRINTF_INT32_MODIFIER +# define PRINTF_INT32_MODIFIER "" +# endif +#else +#error "Platform not supported" +#endif +#endif + +/* + * The macro stdint_int64_defined is temporarily used to record + * whether or not 64 integer support is available. It must be + * defined for any 64 integer extensions for new platforms that are + * added. */ -#ifndef _SYS_STDINT_H_ -#define _SYS_STDINT_H_ +#undef stdint_int64_defined +#if (defined(__STDC__) && defined(__STDC_VERSION__)) || defined (S_SPLINT_S) +# if (__STDC__ && __STDC_VERSION >= 199901L) || defined (S_SPLINT_S) +# define stdint_int64_defined + typedef long long int64_t; + typedef unsigned long long uint64_t; +# define UINT64_C(v) v ## ULL +# define INT64_C(v) v ## LL +# ifndef PRINTF_INT64_MODIFIER +# define PRINTF_INT64_MODIFIER "ll" +# endif +# endif +#endif -#include <sys/cdefs.h> -#include <sys/_types.h> +#if !defined (stdint_int64_defined) +# if defined(__GNUC__) +# define stdint_int64_defined + __extension__ typedef long long int64_t; + __extension__ typedef unsigned long long uint64_t; +# define UINT64_C(v) v ## ULL +# define INT64_C(v) v ## LL +# ifndef PRINTF_INT64_MODIFIER +# define PRINTF_INT64_MODIFIER "ll" +# endif +# elif defined(__MWERKS__) || defined (__SUNPRO_C) || defined (__SUNPRO_CC) || defined (__APPLE_CC__) || defined (_LONG_LONG) || defined (_CRAYC) || defined (S_SPLINT_S) +# define stdint_int64_defined + typedef long long int64_t; + typedef unsigned long long uint64_t; +# define UINT64_C(v) v ## ULL +# define INT64_C(v) v ## LL +# ifndef PRINTF_INT64_MODIFIER +# define PRINTF_INT64_MODIFIER "ll" +# endif +# elif (defined(__WATCOMC__) && defined(__WATCOM_INT64__)) || (defined(_MSC_VER) && _INTEGRAL_MAX_BITS >= 64) || (defined (__BORLANDC__) && __BORLANDC__ > 0x460) || defined (__alpha) || defined (__DECC) +# define stdint_int64_defined + typedef __int64 int64_t; + typedef unsigned __int64 uint64_t; +# define UINT64_C(v) v ## UI64 +# define INT64_C(v) v ## I64 +# ifndef PRINTF_INT64_MODIFIER +# define PRINTF_INT64_MODIFIER "I64" +# endif +# endif +#endif -#include <machine/_stdint.h> +#if !defined (LONG_LONG_MAX) && defined (INT64_C) +# define LONG_LONG_MAX INT64_C (9223372036854775807) +#endif +#ifndef ULONG_LONG_MAX +# define ULONG_LONG_MAX UINT64_C (18446744073709551615) +#endif -#ifndef _INT8_T_DECLARED -typedef __int8_t int8_t; -#define _INT8_T_DECLARED +#if !defined (INT64_MAX) && defined (INT64_C) +# define INT64_MAX INT64_C (9223372036854775807) +#endif +#if !defined (INT64_MIN) && defined (INT64_C) +# define INT64_MIN INT64_C (-9223372036854775808) #endif +#if !defined (UINT64_MAX) && defined (INT64_C) +# define UINT64_MAX UINT64_C (18446744073709551615) +#endif + +/* + * Width of hexadecimal for number field. + */ -#ifndef _INT16_T_DECLARED -typedef __int16_t int16_t; -#define _INT16_T_DECLARED +#ifndef PRINTF_INT64_HEX_WIDTH +# define PRINTF_INT64_HEX_WIDTH "16" +#endif +#ifndef PRINTF_INT32_HEX_WIDTH +# define PRINTF_INT32_HEX_WIDTH "8" +#endif +#ifndef PRINTF_INT16_HEX_WIDTH +# define PRINTF_INT16_HEX_WIDTH "4" +#endif +#ifndef PRINTF_INT8_HEX_WIDTH +# define PRINTF_INT8_HEX_WIDTH "2" #endif -#ifndef _INT32_T_DECLARED -typedef __int32_t int32_t; -#define _INT32_T_DECLARED +#ifndef PRINTF_INT64_DEC_WIDTH +# define PRINTF_INT64_DEC_WIDTH "20" +#endif +#ifndef PRINTF_INT32_DEC_WIDTH +# define PRINTF_INT32_DEC_WIDTH "10" #endif +#ifndef PRINTF_INT16_DEC_WIDTH +# define PRINTF_INT16_DEC_WIDTH "5" +#endif +#ifndef PRINTF_INT8_DEC_WIDTH +# define PRINTF_INT8_DEC_WIDTH "3" +#endif + +/* + * Ok, lets not worry about 128 bit integers for now. Moore's law says + * we don't need to worry about that until about 2040 at which point + * we'll have bigger things to worry about. + */ -#ifndef _INT64_T_DECLARED -typedef __int64_t int64_t; -#define _INT64_T_DECLARED +#ifdef stdint_int64_defined + typedef int64_t intmax_t; + typedef uint64_t uintmax_t; +# define INTMAX_MAX INT64_MAX +# define INTMAX_MIN INT64_MIN +# define UINTMAX_MAX UINT64_MAX +# define UINTMAX_C(v) UINT64_C(v) +# define INTMAX_C(v) INT64_C(v) +# ifndef PRINTF_INTMAX_MODIFIER +# define PRINTF_INTMAX_MODIFIER PRINTF_INT64_MODIFIER +# endif +# ifndef PRINTF_INTMAX_HEX_WIDTH +# define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT64_HEX_WIDTH +# endif +# ifndef PRINTF_INTMAX_DEC_WIDTH +# define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT64_DEC_WIDTH +# endif +#else + typedef int32_t intmax_t; + typedef uint32_t uintmax_t; +# define INTMAX_MAX INT32_MAX +# define UINTMAX_MAX UINT32_MAX +# define UINTMAX_C(v) UINT32_C(v) +# define INTMAX_C(v) INT32_C(v) +# ifndef PRINTF_INTMAX_MODIFIER +# define PRINTF_INTMAX_MODIFIER PRINTF_INT32_MODIFIER +# endif +# ifndef PRINTF_INTMAX_HEX_WIDTH +# define PRINTF_INTMAX_HEX_WIDTH PRINTF_INT32_HEX_WIDTH +# endif +# ifndef PRINTF_INTMAX_DEC_WIDTH +# define PRINTF_INTMAX_DEC_WIDTH PRINTF_INT32_DEC_WIDTH +# endif #endif -#ifndef _UINT8_T_DECLARED -typedef __uint8_t uint8_t; -#define _UINT8_T_DECLARED +/* + * Because this file currently only supports platforms which have + * precise powers of 2 as bit sizes for the default integers, the + * least definitions are all trivial. Its possible that a future + * version of this file could have different definitions. + */ + +#ifndef stdint_least_defined + typedef int8_t int_least8_t; + typedef uint8_t uint_least8_t; + typedef int16_t int_least16_t; + typedef uint16_t uint_least16_t; + typedef int32_t int_least32_t; + typedef uint32_t uint_least32_t; +# define PRINTF_LEAST32_MODIFIER PRINTF_INT32_MODIFIER +# define PRINTF_LEAST16_MODIFIER PRINTF_INT16_MODIFIER +# define UINT_LEAST8_MAX UINT8_MAX +# define INT_LEAST8_MAX INT8_MAX +# define UINT_LEAST16_MAX UINT16_MAX +# define INT_LEAST16_MAX INT16_MAX +# define UINT_LEAST32_MAX UINT32_MAX +# define INT_LEAST32_MAX INT32_MAX +# define INT_LEAST8_MIN INT8_MIN +# define INT_LEAST16_MIN INT16_MIN +# define INT_LEAST32_MIN INT32_MIN +# ifdef stdint_int64_defined + typedef int64_t int_least64_t; + typedef uint64_t uint_least64_t; +# define PRINTF_LEAST64_MODIFIER PRINTF_INT64_MODIFIER +# define UINT_LEAST64_MAX UINT64_MAX +# define INT_LEAST64_MAX INT64_MAX +# define INT_LEAST64_MIN INT64_MIN +# endif #endif +#undef stdint_least_defined + +/* + * The ANSI C committee pretending to know or specify anything about + * performance is the epitome of misguided arrogance. The mandate of + * this file is to *ONLY* ever support that absolute minimum + * definition of the fast integer types, for compatibility purposes. + * No extensions, and no attempt to suggest what may or may not be a + * faster integer type will ever be made in this file. Developers are + * warned to stay away from these types when using this or any other + * stdint.h. + */ -#ifndef _UINT16_T_DECLARED -typedef __uint16_t uint16_t; -#define _UINT16_T_DECLARED +typedef int_least8_t int_fast8_t; +typedef uint_least8_t uint_fast8_t; +typedef int_least16_t int_fast16_t; +typedef uint_least16_t uint_fast16_t; +typedef int_least32_t int_fast32_t; +typedef uint_least32_t uint_fast32_t; +#define UINT_FAST8_MAX UINT_LEAST8_MAX +#define INT_FAST8_MAX INT_LEAST8_MAX +#define UINT_FAST16_MAX UINT_LEAST16_MAX +#define INT_FAST16_MAX INT_LEAST16_MAX +#define UINT_FAST32_MAX UINT_LEAST32_MAX +#define INT_FAST32_MAX INT_LEAST32_MAX +#define INT_FAST8_MIN INT_LEAST8_MIN +#define INT_FAST16_MIN INT_LEAST16_MIN +#define INT_FAST32_MIN INT_LEAST32_MIN +#ifdef stdint_int64_defined + typedef int_least64_t int_fast64_t; + typedef uint_least64_t uint_fast64_t; +# define UINT_FAST64_MAX UINT_LEAST64_MAX +# define INT_FAST64_MAX INT_LEAST64_MAX +# define INT_FAST64_MIN INT_LEAST64_MIN #endif -#ifndef _UINT32_T_DECLARED -typedef __uint32_t uint32_t; -#define _UINT32_T_DECLARED +#undef stdint_int64_defined + +/* + * Whatever piecemeal, per compiler thing we can do about the wchar_t + * type limits. + */ + +#if defined(__WATCOMC__) || defined(_MSC_VER) || defined (__GNUC__) +# include <wchar.h> +# ifndef WCHAR_MIN +# define WCHAR_MIN 0 +# endif +# ifndef WCHAR_MAX +# define WCHAR_MAX ((wchar_t)-1) +# endif #endif -#ifndef _UINT64_T_DECLARED -typedef __uint64_t uint64_t; -#define _UINT64_T_DECLARED +/* + * Whatever piecemeal, per compiler/platform thing we can do about the + * (u)intptr_t types and limits. + */ + +#if defined (_MSC_VER) && defined (_UINTPTR_T_DEFINED) +# define STDINT_H_UINTPTR_T_DEFINED #endif -typedef __int_least8_t int_least8_t; -typedef __int_least16_t int_least16_t; -typedef __int_least32_t int_least32_t; -typedef __int_least64_t int_least64_t; +#ifndef STDINT_H_UINTPTR_T_DEFINED +# if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (_WIN64) +# define stdint_intptr_bits 64 +# elif defined (__WATCOMC__) || defined (__TURBOC__) +# if defined(__TINY__) || defined(__SMALL__) || defined(__MEDIUM__) +# define stdint_intptr_bits 16 +# else +# define stdint_intptr_bits 32 +# endif +# elif defined (__i386__) || defined (_WIN32) || defined (WIN32) +# define stdint_intptr_bits 32 +# elif defined (__INTEL_COMPILER) +/* TODO -- what will Intel do about x86-64? */ +# endif -typedef __uint_least8_t uint_least8_t; -typedef __uint_least16_t uint_least16_t; -typedef __uint_least32_t uint_least32_t; -typedef __uint_least64_t uint_least64_t; +# ifdef stdint_intptr_bits +# define stdint_intptr_glue3_i(a,b,c) a##b##c +# define stdint_intptr_glue3(a,b,c) stdint_intptr_glue3_i(a,b,c) +# ifndef PRINTF_INTPTR_MODIFIER +# define PRINTF_INTPTR_MODIFIER stdint_intptr_glue3(PRINTF_INT,stdint_intptr_bits,_MODIFIER) +# endif +# ifndef PTRDIFF_MAX +# define PTRDIFF_MAX stdint_intptr_glue3(INT,stdint_intptr_bits,_MAX) +# endif +# ifndef PTRDIFF_MIN +# define PTRDIFF_MIN stdint_intptr_glue3(INT,stdint_intptr_bits,_MIN) +# endif +# ifndef UINTPTR_MAX +# define UINTPTR_MAX stdint_intptr_glue3(UINT,stdint_intptr_bits,_MAX) +# endif +# ifndef INTPTR_MAX +# define INTPTR_MAX stdint_intptr_glue3(INT,stdint_intptr_bits,_MAX) +# endif +# ifndef INTPTR_MIN +# define INTPTR_MIN stdint_intptr_glue3(INT,stdint_intptr_bits,_MIN) +# endif +# ifndef INTPTR_C +# define INTPTR_C(x) stdint_intptr_glue3(INT,stdint_intptr_bits,_C)(x) +# endif +# ifndef UINTPTR_C +# define UINTPTR_C(x) stdint_intptr_glue3(UINT,stdint_intptr_bits,_C)(x) +# endif + typedef stdint_intptr_glue3(uint,stdint_intptr_bits,_t) uintptr_t; + typedef stdint_intptr_glue3( int,stdint_intptr_bits,_t) intptr_t; +# else +/* TODO -- This following is likely wrong for some platforms, and does + nothing for the definition of uintptr_t. */ + typedef ptrdiff_t intptr_t; +# endif +# define STDINT_H_UINTPTR_T_DEFINED +#endif -typedef __int_fast8_t int_fast8_t; -typedef __int_fast16_t int_fast16_t; -typedef __int_fast32_t int_fast32_t; -typedef __int_fast64_t int_fast64_t; +/* + * Assumes sig_atomic_t is signed and we have a 2s complement machine. + */ + +#ifndef SIG_ATOMIC_MAX +# define SIG_ATOMIC_MAX ((((sig_atomic_t) 1) << (sizeof (sig_atomic_t)*CHAR_BIT-1)) - 1) +#endif -typedef __uint_fast8_t uint_fast8_t; -typedef __uint_fast16_t uint_fast16_t; -typedef __uint_fast32_t uint_fast32_t; -typedef __uint_fast64_t uint_fast64_t; +#endif + +#if defined (__TEST_PSTDINT_FOR_CORRECTNESS) + +/* + * Please compile with the maximum warning settings to make sure macros are not + * defined more than once. + */ + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> + +#define glue3_aux(x,y,z) x ## y ## z +#define glue3(x,y,z) glue3_aux(x,y,z) -typedef __intmax_t intmax_t; -typedef __uintmax_t uintmax_t; +#define DECLU(bits) glue3(uint,bits,_t) glue3(u,bits,=) glue3(UINT,bits,_C) (0); +#define DECLI(bits) glue3(int,bits,_t) glue3(i,bits,=) glue3(INT,bits,_C) (0); -#ifndef _INTPTR_T_DECLARED -typedef __intptr_t intptr_t; -typedef __uintptr_t uintptr_t; -#define _INTPTR_T_DECLARED +#define DECL(us,bits) glue3(DECL,us,) (bits) + +#define TESTUMAX(bits) glue3(u,bits,=) glue3(~,u,bits); if (glue3(UINT,bits,_MAX) glue3(!=,u,bits)) printf ("Something wrong with UINT%d_MAX\n", bits) + +int main () { + DECL(I,8) + DECL(U,8) + DECL(I,16) + DECL(U,16) + DECL(I,32) + DECL(U,32) +#ifdef INT64_MAX + DECL(I,64) + DECL(U,64) +#endif + intmax_t imax = INTMAX_C(0); + uintmax_t umax = UINTMAX_C(0); + char str0[256], str1[256]; + + sprintf (str0, "%d %x\n", 0, ~0); + + sprintf (str1, "%d %x\n", i8, ~0); + if (0 != strcmp (str0, str1)) printf ("Something wrong with i8 : %s\n", str1); + sprintf (str1, "%u %x\n", u8, ~0); + if (0 != strcmp (str0, str1)) printf ("Something wrong with u8 : %s\n", str1); + sprintf (str1, "%d %x\n", i16, ~0); + if (0 != strcmp (str0, str1)) printf ("Something wrong with i16 : %s\n", str1); + sprintf (str1, "%u %x\n", u16, ~0); + if (0 != strcmp (str0, str1)) printf ("Something wrong with u16 : %s\n", str1); + sprintf (str1, "%" PRINTF_INT32_MODIFIER "d %x\n", i32, ~0); + if (0 != strcmp (str0, str1)) printf ("Something wrong with i32 : %s\n", str1); + sprintf (str1, "%" PRINTF_INT32_MODIFIER "u %x\n", u32, ~0); + if (0 != strcmp (str0, str1)) printf ("Something wrong with u32 : %s\n", str1); +#ifdef INT64_MAX + sprintf (str1, "%" PRINTF_INT64_MODIFIER "d %x\n", i64, ~0); + if (0 != strcmp (str0, str1)) printf ("Something wrong with i64 : %s\n", str1); #endif + sprintf (str1, "%" PRINTF_INTMAX_MODIFIER "d %x\n", imax, ~0); + if (0 != strcmp (str0, str1)) printf ("Something wrong with imax : %s\n", str1); + sprintf (str1, "%" PRINTF_INTMAX_MODIFIER "u %x\n", umax, ~0); + if (0 != strcmp (str0, str1)) printf ("Something wrong with umax : %s\n", str1); + + TESTUMAX(8); + TESTUMAX(16); + TESTUMAX(32); +#ifdef INT64_MAX + TESTUMAX(64); +#endif + + return EXIT_SUCCESS; +} -#endif /* !_SYS_STDINT_H_ */ +#endif libs/basekit/source/PortableStdint.h @@ -1059,9 +1059,11 @@ int UArray_contains_(const UArray *self, const UArray *other) long UArray_find_from_(const UArray *self, const UArray *other, size_t from) { + UArray s; + long i; if (self->size < from) return -1; - UArray s = UArray_stackRange(self, from, self->size - from); - long i = UArray_find_(&s, other); + s = UArray_stackRange(self, from, self->size - from); + i = UArray_find_(&s, other); return i == -1 ? -1 : from + i; } libs/basekit/source/UArray.c @@ -64,7 +64,7 @@ typedef struct CallbackBlock CoroStartCallback *func; } CallbackBlock; -//static CallbackBlock globalCallbackBlock; +static CallbackBlock globalCallbackBlock; Coro *Coro_new(void) { @@ -239,13 +239,13 @@ void Coro_StartWithArg(CallbackBlock *block) exit(-1); } -/* + void Coro_Start(void) { CallbackBlock block = globalCallbackBlock; Coro_StartWithArg(&block); } - */ + #endif // -------------------------------------------------------------------- libs/coroutine/source/Coro.c @@ -29,7 +29,7 @@ file close #include <stdio.h> #include <sys/types.h> #include <sys/stat.h> -#include <sys/wait.h> +/*#include <sys/wait.h>*/ #if !defined(_MSC_VER) && !defined(__SYMBIAN32__) #include <unistd.h> /* ok, this isn't ANSI */ @@ -236,7 +236,7 @@ void IoFile_justClose(IoFile *self) { int exitStatus = pclose(stream); IoObject_setSlot_to_(self, IOSYMBOL("exitStatus"), - IONUMBER(WEXITSTATUS(exitStatus))); + IONUMBER(exitStatus)); } else { libs/iovm/source/IoFile.c @@ -18,7 +18,7 @@ extern "C" { typedef IoObject IoMap; IoMap *IoMap_proto(void *state); -IoMap *IoMap_rawClone(IoMap *self); +IOVM_API IoMap *IoMap_rawClone(IoMap *self); IoMap *IoMap_new(void *state); void IoMap_free(IoMap *self); void IoMap_mark(IoMap *self); libs/iovm/source/IoMap.h @@ -75,11 +75,11 @@ IoMessage *IoMessage_newFromText_label_(void *state, const char *text, const cha IoMessage *IoMessage_newFromText_labelSymbol_(void *state, const char *text, IoSymbol *label) { IoLexer *lexer; + IoMessage *msg; IoState_pushCollectorPause(state); // needed? lexer = IoLexer_new(); - IoMessage *msg; IoLexer_string_(lexer, text); IoLexer_lex(lexer); libs/iovm/source/IoMessage_parser.c @@ -40,7 +40,7 @@ IOVM_API UArray IoNumber_asStackUArray(IoNumber *self); IOVM_API int IoNumber_asInt(IoNumber *self); long IoNumber_asLong(IoNumber *self); IOVM_API double IoNumber_asDouble(IoNumber *self); -float IoNumber_asFloat(IoNumber *self); +IOVM_API float IoNumber_asFloat(IoNumber *self); IOVM_API int IoNumber_compare(IoNumber *self, IoNumber *v); IOVM_API void IoNumber_print(IoNumber *self); //void IoNumber_rawSet(IoNumber *self, double v); libs/iovm/source/IoNumber.h @@ -10,6 +10,9 @@ #include "IoVMApi.h" #include "IoState.h" +#include "PHash.h" + +#define Records_recordAt_(records, pos) (PHashRecord *)(records + (pos * sizeof(PHashRecord))) IOINLINE PHashRecord *PHash_record1_(PHash *self, void *k) { libs/iovm/source/IoObject_inline.h @@ -63,6 +63,21 @@ static void setenv(const char *varName, const char* value, int force) } //#define setenv(k, v, o) SetEnvironmentVariable((k), (v)) + +IO_METHOD(IoObject, installPrefix) +{ + + char acPath[256]; + char root[256]; + if( GetModuleFileName( NULL, acPath, 256 ) != 0) + { + // guaranteed file name of at least one character after path + strcpy(( strrchr( acPath, '\\' ) ), "\\..\\"); + _fullpath(root,acPath,256); + } + + return IoState_symbolWithCString_(IOSTATE, root); +} #endif #if defined(__CYGWIN__) || defined(_WIN32) @@ -74,6 +89,7 @@ IoObject *IoSystem_proto(void *state) IoMethodTable methodTable[] = { #ifdef WIN32 {"shellExecute", IoObject_shellExecute}, + {"installPrefix", IoObject_installPrefix}, #else {"daemon", IoObject_daemon}, #endif @@ -117,7 +133,9 @@ IoObject *IoSystem_proto(void *state) Returns the root path where io was install. The default is /usr/local. */ +#ifndef WIN32 IoObject_setSlot_to_(self, IOSYMBOL("installPrefix"), IOSYMBOL(INSTALL_PREFIX)); +#endif return self; } @@ -493,6 +511,7 @@ IO_METHOD(IoObject, thisProcessPid) return IONUMBER(getpid()); } + /*doc System version Returns a version number for Io. */ libs/iovm/source/IoSystem.c @@ -17,7 +17,7 @@ extern "C" { IoObject *IoSystem_proto(void *state); -#ifdef WIN32 +#if defined(__CYGWIN__) || defined(_WIN32) IO_METHOD(IoObject, shellExecute); #else IO_METHOD(IoObject, daemon); libs/iovm/source/IoSystem.h @@ -5,6 +5,7 @@ #define PHASH_C #include "PHash.h" #undef PHASH_C +#include "IoObject.h" #include <stdlib.h> #include <stdio.h> #include <string.h> libs/iovm/source/PHash.c @@ -12,7 +12,8 @@ #include "Common.h" #include <stddef.h> -#include <stdint.h> +#include "IoVMApi.h" +#include "PortableStdint.h" /* #define BASEKIT_API @@ -30,27 +31,27 @@ extern "C" { #include "PHash_struct.h" -BASEKIT_API PHash *PHash_new(void); -BASEKIT_API void PHash_copy_(PHash *self, const PHash *other); -BASEKIT_API PHash *PHash_clone(PHash *self); -BASEKIT_API void PHash_free(PHash *self); +PHash *PHash_new(void); +void PHash_copy_(PHash *self, const PHash *other); +PHash *PHash_clone(PHash *self); +void PHash_free(PHash *self); -BASEKIT_API void PHash_at_put_(PHash *self, void *k, void *v); -BASEKIT_API void PHash_removeKey_(PHash *self, void *k); -BASEKIT_API size_t PHash_size(PHash *self); // actually the keyCount +void PHash_at_put_(PHash *self, void *k, void *v); +void PHash_removeKey_(PHash *self, void *k); +IOVM_API size_t PHash_size(PHash *self); // actually the keyCount -BASEKIT_API size_t PHash_memorySize(PHash *self); -BASEKIT_API void PHash_compact(PHash *self); +size_t PHash_memorySize(PHash *self); +void PHash_compact(PHash *self); // --- private methods ---------------------------------------- -BASEKIT_API void PHash_setSize_(PHash *self, size_t size); -BASEKIT_API void PHash_insert_(PHash *self, PHashRecord *x); -BASEKIT_API void PHash_grow(PHash *self); -BASEKIT_API void PHash_shrinkIfNeeded(PHash *self); -BASEKIT_API void PHash_shrink(PHash *self); -BASEKIT_API void PHash_show(PHash *self); -BASEKIT_API void PHash_updateMask(PHash *self); +IOVM_API void PHash_setSize_(PHash *self, size_t size); +IOVM_API void PHash_insert_(PHash *self, PHashRecord *x); +IOVM_API void PHash_grow(PHash *self); +void PHash_shrinkIfNeeded(PHash *self); +IOVM_API void PHash_shrink(PHash *self); +IOVM_API void PHash_show(PHash *self); +IOVM_API void PHash_updateMask(PHash *self); #include "PHash_inline.h" libs/iovm/source/PHash.h @@ -32,6 +32,7 @@ LIBS := $(sublibs_l) LINKDIRFLAG := -L LINKLIBFLAG := -l DLL_LIB_SUFFIX := +DLL_LIB_PREFIX := lib SYS ?= $(shell uname -s) @@ -68,8 +69,8 @@ ifeq ($(SYS),Darwin) DLL_SUFFIX := dylib DLL_COMMAND := -dynamiclib FLAT_NAMESPACE := -flat_namespace -#FIXDLL := install_name_tool _build/binaries/io$(BINARY_SUFFIX) -change _build/dll/libiovmall.dylib @executable_path/libiovmall.dylib -FIXDLL := install_name_tool _build/binaries/io$(BINARY_SUFFIX) -change _build/dll/libiovmall.dylib @executable_path/../lib/libiovmall.dylib +#FIXDLL := install_name_tool _build/binaries/io$(BINARY_SUFFIX) -change _build/dll/$(DLL_LIB_PREFIX)iovmall.dylib @executable_path/$(DLL_LIB_PREFIX)iovmall.dylib +FIXDLL := install_name_tool _build/binaries/io$(BINARY_SUFFIX) -change _build/dll/$(DLL_LIB_PREFIX)iovmall.dylib @executable_path/../lib/$(DLL_LIB_PREFIX)iovmall.dylib endif ifeq ($(SYS),IRIX) @@ -99,8 +100,9 @@ LFLAGS += ws2_32.lib kernel32.lib shell32.lib OPTIMIZE := -Zi -MD -DWIN32 -DNDEBUG -DBUILDING_IOVMALL_DLL -D_CRT_SECURE_NO_DEPRECATE WARN := LINKDIRFLAG := -libpath: -LINKLIBFLAG := lib +LINKLIBFLAG := DLL_LIB_SUFFIX := .lib +DLL_LIB_PREFIX := BINARY_SUFFIX := .exe endif @@ -121,10 +123,10 @@ all: $(CC) $(CFLAGS) -c $(CCOUTFLAG)_build/objs/main.o source/main.c $(HEADERS) #_build/binaries/io_static$(BINARY_SUFFIX): _build/objs/main.o - $(LINK) $(LINKOUTFLAG)_build/binaries/io_static$(BINARY_SUFFIX) _build/objs/main.o ../_build/lib/libiovmall.a $(LFLAGS) + $(LINK) $(LINKOUTFLAG)_build/binaries/io_static$(BINARY_SUFFIX) _build/objs/main.o ../_build/lib/$(DLL_LIB_PREFIX)iovmall.a $(LFLAGS) #_build/binaries/io: _build/objs/main.o - #$(CC) $(CFLAGS) $(FLAT_NAMESPACE) $(LFLAGS) -o _build/binaries/io$(BINARY_SUFFIX) _build/objs/main.o ../_build/dll/libiovmall.$(DLL_SUFFIX) + #$(CC) $(CFLAGS) $(FLAT_NAMESPACE) $(LFLAGS) -o _build/binaries/io$(BINARY_SUFFIX) _build/objs/main.o ../_build/dll/$(DLL_LIB_PREFIX)iovmall.$(DLL_SUFFIX) $(LINK) $(FLAT_NAMESPACE) $(LFLAGS) $(LINKOUTFLAG)_build/binaries/io$(BINARY_SUFFIX) _build/objs/main.o $(LINKDIRFLAG)../_build/dll $(LINKLIBFLAG)iovmall$(DLL_LIB_SUFFIX) $(FIXDLL) tools/Makefile fd8745c00b079963c5bc8398f634cc5651b57bbc U-KHEPRI\pgregory pgregory@khepri.(none) http://github.com/stevedekorte/io/commit/9b0ad4830fde776eeee2b75580f835b5bb1c2ecc 9b0ad4830fde776eeee2b75580f835b5bb1c2ecc 2009-05-09T09:06:56-07:00 2009-05-09T09:06:56-07:00 Various changes to support a cleaner build and install on Win32. Update the Makefile system to allow specification of a library/dll prefix, as on Win32 there is normally no 'lib' prefix. Various minor changes to support the non C99 status of VC8. Various changes to the new PHash code to work under Windows, it seems that the recent refactor introduced some API errors, the PHash functions were still being marked with the BASEKIT_API macro. Change the implementation of the "System installPrefix" on Win32 only to calculate the install location from the binary location instead of fixing it at compile time. This will allow the Win32 version to be installed anywhere. 525713288b5e9ba38c0edf460b59560de5f493d0 U-KHEPRI\pgregory pgregory@khepri.(none)