libc.obj:

- Added inttypes header;
 - Fixed warnings in mouse api wrappers;
 - Preparation for build only via tcc+fasm.


git-svn-id: svn://kolibrios.org@9774 a494cfbc-eb01-0410-851d-a64ba20cac60

programs/develop/ktcc/trunk/libc.obj/.gitignore

@@ -1,8 +0,0 @@
-*.swp
-lib/libc.obj
-lib/libc.obj.a
-lib/crt0.o
-*.o
-tests/argtest
-source/make.bat
-/samples/*.kex

programs/develop/ktcc/trunk/libc.obj/include/inttypes.h

@@ -0,0 +1,201 @@
+#ifndef _INTTYPES_H_
+#define _INTTYPES_H_
+
+#include <stdint.h>
+
+#define __PRI64  "ll"
+#define __PRIPTR ""
+
+#define PRId8  "d"
+#define PRId16 "d"
+#define PRId32 "d"
+#define PRId64 __PRI64 "d"
+
+#define PRIdLEAST8  "d"
+#define PRIdLEAST16 "d"
+#define PRIdLEAST32 "d"
+#define PRIdLEAST64 __PRI64 "d"
+
+#define PRIdFAST8  "d"
+#define PRIdFAST16 "d"
+#define PRIdFAST32 "d"
+#define PRIdFAST64 __PRI64 "d"
+
+#define PRIi8  "i"
+#define PRIi16 "i"
+#define PRIi32 "i"
+#define PRIi64 __PRI64 "i"
+
+#define PRIiLEAST8  "i"
+#define PRIiLEAST16 "i"
+#define PRIiLEAST32 "i"
+#define PRIiLEAST64 __PRI64 "i"
+
+#define PRIiFAST8  "i"
+#define PRIiFAST16 "i"
+#define PRIiFAST32 "i"
+#define PRIiFAST64 __PRI64 "i"
+
+#define PRIo8  "o"
+#define PRIo16 "o"
+#define PRIo32 "o"
+#define PRIo64 __PRI64 "o"
+
+#define PRIoLEAST8  "o"
+#define PRIoLEAST16 "o"
+#define PRIoLEAST32 "o"
+#define PRIoLEAST64 __PRI64 "o"
+
+#define PRIoFAST8  "o"
+#define PRIoFAST16 "o"
+#define PRIoFAST32 "o"
+#define PRIoFAST64 __PRI64 "o"
+
+#define PRIu8  "u"
+#define PRIu16 "u"
+#define PRIu32 "u"
+#define PRIu64 __PRI64 "u"
+
+#define PRIuLEAST8  "u"
+#define PRIuLEAST16 "u"
+#define PRIuLEAST32 "u"
+#define PRIuLEAST64 __PRI64 "u"
+
+#define PRIuFAST8  "u"
+#define PRIuFAST16 "u"
+#define PRIuFAST32 "u"
+#define PRIuFAST64 __PRI64 "u"
+
+#define PRIx8  "x"
+#define PRIx16 "x"
+#define PRIx32 "x"
+#define PRIx64 __PRI64 "x"
+
+#define PRIxLEAST8  "x"
+#define PRIxLEAST16 "x"
+#define PRIxLEAST32 "x"
+#define PRIxLEAST64 __PRI64 "x"
+
+#define PRIxFAST8  "x"
+#define PRIxFAST16 "x"
+#define PRIxFAST32 "x"
+#define PRIxFAST64 __PRI64 "x"
+
+#define PRIX8  "X"
+#define PRIX16 "X"
+#define PRIX32 "X"
+#define PRIX64 __PRI64 "X"
+
+#define PRIXLEAST8  "X"
+#define PRIXLEAST16 "X"
+#define PRIXLEAST32 "X"
+#define PRIXLEAST64 __PRI64 "X"
+
+#define PRIXFAST8  "X"
+#define PRIXFAST16 "X"
+#define PRIXFAST32 "X"
+#define PRIXFAST64 __PRI64 "X"
+
+#define PRIdMAX __PRI64 "d"
+#define PRIiMAX __PRI64 "i"
+#define PRIoMAX __PRI64 "o"
+#define PRIuMAX __PRI64 "u"
+#define PRIxMAX __PRI64 "x"
+#define PRIXMAX __PRI64 "X"
+
+#define PRIdPTR __PRIPTR "d"
+#define PRIiPTR __PRIPTR "i"
+#define PRIoPTR __PRIPTR "o"
+#define PRIuPTR __PRIPTR "u"
+#define PRIxPTR __PRIPTR "x"
+#define PRIXPTR __PRIPTR "X"
+
+#define SCNd8   "hhd"
+#define SCNd16  "hd"
+#define SCNd32  "d"
+#define SCNd64  __PRI64 "d"
+
+#define SCNdLEAST8  "hhd"
+#define SCNdLEAST16 "hd"
+#define SCNdLEAST32 "d"
+#define SCNdLEAST64 __PRI64 "d"
+
+#define SCNdFAST8  "hhd"
+#define SCNdFAST16 "d"
+#define SCNdFAST32 "d"
+#define SCNdFAST64 __PRI64 "d"
+
+#define SCNi8   "hhi"
+#define SCNi16  "hi"
+#define SCNi32  "i"
+#define SCNi64  __PRI64 "i"
+
+#define SCNiLEAST8  "hhi"
+#define SCNiLEAST16 "hi"
+#define SCNiLEAST32 "i"
+#define SCNiLEAST64 __PRI64 "i"
+
+#define SCNiFAST8  "hhi"
+#define SCNiFAST16 "i"
+#define SCNiFAST32 "i"
+#define SCNiFAST64 __PRI64 "i"
+
+#define SCNu8   "hhu"
+#define SCNu16  "hu"
+#define SCNu32  "u"
+#define SCNu64  __PRI64 "u"
+
+#define SCNuLEAST8  "hhu"
+#define SCNuLEAST16 "hu"
+#define SCNuLEAST32 "u"
+#define SCNuLEAST64 __PRI64 "u"
+
+#define SCNuFAST8 "hhu"
+#define SCNuFAST16 "u"
+#define SCNuFAST32 "u"
+#define SCNuFAST64 __PRI64 "u"
+
+#define SCNo8   "hho"
+#define SCNo16  "ho"
+#define SCNo32  "o"
+#define SCNo64  __PRI64 "o"
+
+#define SCNoLEAST8  "hho"
+#define SCNoLEAST16 "ho"
+#define SCNoLEAST32 "o"
+#define SCNoLEAST64 __PRI64 "o"
+
+#define SCNoFAST8  "hho"
+#define SCNoFAST16 "o"
+#define SCNoFAST32 "o"
+#define SCNoFAST64 __PRI64 "o"
+
+#define SCNx8   "hhx"
+#define SCNx16  "hx"
+#define SCNx32  "x"
+#define SCNx64  __PRI64 "x"
+
+#define SCNxLEAST8  "hhx"
+#define SCNxLEAST16 "hx"
+#define SCNxLEAST32 "x"
+#define SCNxLEAST64 __PRI64 "x"
+
+#define SCNxFAST8  "hhx"
+#define SCNxFAST16 "x"
+#define SCNxFAST32 "x"
+#define SCNxFAST64 __PRI64 "x"
+
+#define SCNdMAX __PRI64 "d"
+#define SCNiMAX __PRI64 "i"
+#define SCNoMAX __PRI64 "o"
+#define SCNuMAX __PRI64 "u"
+#define SCNxMAX __PRI64 "x"
+
+#define SCNdPTR __PRIPTR "d"
+#define SCNiPTR __PRIPTR "i"
+#define SCNoPTR __PRIPTR "o"
+#define SCNuPTR __PRIPTR "u"
+#define SCNxPTR __PRIPTR "x"
+
+#endif
+

programs/develop/ktcc/trunk/libc.obj/include/sys/ksys.h

@@ -783,7 +783,7 @@ enum KSYS_CURSOR_SRC {
 
 KOSAPI void* _ksys_load_cursor(void* path, uint32_t flags) // subfunction 4 - load cursor
 {
-    uint32_t val;
+    void* val;
     asm_inline(
         "int $0x40"
         : "=a"(val)
@@ -794,7 +794,7 @@ KOSAPI void* _ksys_load_cursor(void* path, uint32_t flags) // subfunction 4 - lo
 
 KOSAPI void* _ksys_set_cursor(void* cursor) // subfunction 5 - set cursor
 {
-    uint32_t old;
+    void* old;
     asm_inline(
         "int $0x40"
         : "=a"(old)

programs/develop/ktcc/trunk/libc.obj/source/Tupfile.lua

@@ -1,3 +1,4 @@
+if tup.getconfig("NO_FASM") ~= "" then return end
 if tup.getconfig("NO_GCC") ~= "" then return end
 HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../../../" or tup.getconfig("HELPERDIR")
 tup.include(HELPERDIR .. "/use_gcc.lua")
@@ -5,4 +6,13 @@ tup.include(HELPERDIR .. "/use_gcc.lua")
 CFLAGS = " -c -nostdinc -DGNUC -D_BUILD_LIBC -Os -fno-common -fno-builtin -fno-leading-underscore -fno-pie"
 INCLUDES = " -I../include"
 
-tup.rule("libc.c", "kos32-gcc" .. CFLAGS .. INCLUDES .. " -o %o %f " .. tup.getconfig("KPACK_CMD"), "libc.obj")
+OBJS = {"math/tan.obj", "math/sqrt.obj"}
+
+for _, OBJ in pairs(OBJS) do
+    tup.rule(string.gsub(OBJ, ".obj", ".asm"), "fasm %f %o ", OBJ)
+end
+
+tup.rule("libc.c", "kos32-gcc" .. CFLAGS .. INCLUDES .. " -o %o %f ", "libc_tmp.obj")
+
+table.insert(OBJS, "libc_tmp.obj");
+tup.rule(OBJS, "clink -o %o %f" .. " && kos32-strip %o --strip-unneeded " .. tup.getconfig("KPACK_CMD"), "libc.obj");

programs/develop/ktcc/trunk/libc.obj/source/libc.c

@@ -139,9 +139,7 @@ __asm__(
     ".include \"math/pow2.s\"\n\t"
     ".include \"math/pow10.s\"\n\t"
     ".include \"math/round.s\"\n\t"
-    ".include \"math/sqrt.s\"\n\t"
+    ".include \"math/sin.s\"\n\t");
-    ".include \"math/sin.s\"\n\t"
-    ".include \"math/tan.s\"\n\t");
 
 __asm__(
     ".include \"string/memmove.s\"\n\t"

programs/develop/ktcc/trunk/libc.obj/source/libtcc1/Makefile

@@ -1,11 +1,10 @@
 KTCC=kos32-tcc
-
 FASM=fasm
 
 OBJ= memcpy.o  memmove.o  memset.o  libtcc1.o
 
 all: $(OBJ)
-	ar -crs ../../../bin/lib/libtcc.a $(OBJ)
+	ar -crs ../../../bin/lib/libtcc1.a $(OBJ)
 	rm -f *.o
 
 %.o : %.c

programs/develop/ktcc/trunk/libc.obj/source/libtcc1/memcpy.asm

@@ -8,15 +8,14 @@ public memcpy
 proc memcpy c, to:dword,from:dword,count:dword
     push    esi
     push    edi
-    mov ecx,[count]
+    mov     ecx, [count]
-	test ecx,ecx
+    test    ecx, ecx
-	jz no_copy_block
+    jz      .no_copy_block
-        mov esi,[from]
+    mov     esi, [from]
-		mov edi,[to]
+    mov     edi, [to]
     cld
     rep     movsb
-no_copy_block:
+.no_copy_block:
-
     pop     edi
     pop     esi
     mov     eax, [to]

programs/develop/ktcc/trunk/libc.obj/source/libtcc1/memmove.asm

@@ -6,27 +6,25 @@ include '../../../../../../proc32.inc'
 public memmove
 
 proc memmove c, to:dword,from:dword,count:dword
-
     push    esi
     push    edi
     mov     ecx,[count]
     test    ecx,ecx
-	jz no_copy_block_
+    jz      .no_copy_block
     mov     esi,[from]
     mov     edi,[to]
     cmp     esi, edi
-		je no_copy_block_
+    je      .no_copy_block
-		jg copy_
+    jg      .copy
     add     esi, ecx
     add     edi, ecx
     dec     esi
     dec     edi
     std
-copy_:
+.copy:
     rep     movsb
     cld
-no_copy_block_:
+.no_copy_block:
-
     pop     edi
     pop     esi
     mov     eax,[to]

programs/develop/ktcc/trunk/libc.obj/source/libtcc1/memset.asm

@@ -4,9 +4,9 @@ public memset
 
 memset:
     push    edi
-  mov	edi,[esp+8]
+    mov     edi, [esp+8]
-  mov	eax,[esp+12]
+    mov     eax, [esp+12]
-  mov	ecx,[esp+16]
+    mov     ecx, [esp+16]
     jecxz  .no_set
     cld
     rep     stosb

programs/develop/ktcc/trunk/libc.obj/source/math/sqrt.asm

@@ -0,0 +1,9 @@
+format COFF
+section '.text'
+
+public _sqrt as "sqrt"
+
+_sqrt:
+    fld qword[esp+4]
+    fsqrt
+    ret

programs/develop/ktcc/trunk/libc.obj/source/math/sqrt.s

@@ -1,8 +0,0 @@
-/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-
-.global sqrt;
-
-sqrt:
-	fldl	4(%esp)
-	fsqrt
-	ret

programs/develop/ktcc/trunk/libc.obj/source/math/tan.s

@@ -1,16 +0,0 @@
-/* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-
-tan.L0:
-	.quad	0xffffffffffffffff
-
-tan:
-	fldl	4(%esp)
-	fptan
-	fstsw
-	fstp	%st(0)
-	sahf
-	jnp	tan.L1
-/*	fstp	%st(0) - if exception, there is nothing on the stack */
-	fldl	tan.L0
-tan.L1:
-	ret