Merge pull request #2102 from ghaerr/libcasm

[kernel,libc] Various small cleanups

elks/Makefile-rules

@@ -20,9 +20,9 @@ include $(TOPDIR)/Make.defs
 #			extensively through these definitions, so must be
 #			correct.
 #
-#	USEBCC		Whether to compile using BCC or GCC. If this is
-#			set to 'N' it compiles using GCC, otherwise it
-#			compiles using BCC.
+#	USEBCC		Whether to compile using ia16-elf-gcc or host GCC.
+#			If this is set to 'N' it compiles using GCC, otherwise
+#			it compiles using ia16-elf-gcc.
 #
 #	CLEANDEP	Any files in the current directory that the
 #			`make dep` command is dependent on.

elks/arch/i86/drivers/char/Makefile

@@ -15,7 +15,7 @@ BASEDIR 	= ../../../..
 # Define the variables required by the standard rules - see the standard
 # rules file (below) for details of these variables.
 
-USEBCC 		= 
+USEBCC 		= Y
 
 CLEANDEP	= 
 

elks/arch/i86/kernel/Makefile

@@ -15,7 +15,7 @@ BASEDIR 	= ../../..
 # Define the variables required by the standard rules - see the standard
 # rules file (below) for details of these variables.
 
-USEBCC 		=
+USEBCC 		= Y
 
 CLEANDEP	= 
 

elks/arch/i86/lib/Makefile

@@ -9,7 +9,7 @@ BASEDIR 	= ../../..
 # Define the variables required by the standard rules - see the standard
 # rules file (below) for details of these variables.
 
-USEBCC 		=
+USEBCC 		= Y
 
 CLEANDEP	= 
 

elks/include/linuxmt/minix_fs.h

@@ -39,7 +39,7 @@ struct minix_inode_info {
 };
 
 /*  This is the original minix inode layout on disk.
- *  Note the 8-bit gid and atime and ctime.
+ *  Note the 8-bit gid and missing atime and ctime.
  */
 struct minix_inode {
     __u16	i_mode;

elks/init/main.c

@@ -448,7 +448,7 @@ static int INITPROC parse_options(void)
     fmemcpyb(opts.options, kernel_ds, 0, DEF_OPTSEG, sizeof(opts.options));
 
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-    /* check file starts with ##, one or two sectors, max 1023 bytes */
+    /* check file starts with ##, one or two sectors, max 1023 bytes or 511 one sector */
     if (*(unsigned short *)opts.options != 0x2323 ||
         (opts.options[511] && opts.options[OPTSEGSZ-1]))
         return 0;

elkscmd/sys_utils/meminfo.c

@@ -106,7 +106,7 @@ void display_seg(int fd, word_t mem)
     byte_t ref_count = getword(fd, mem + offsetof(segment_s, ref_count), ds);
     struct task_struct *t;
 
-    printf("   %4x   %s %7ld %4d  ",
+    printf("   %04x   %s %7ld %4d  ",
         segbase, segtype[segflags], (long)segsize << 4, ref_count);
     if (segflags == SEG_FLAG_CSEG || segflags == SEG_FLAG_DSEG) {
         if ((t = find_process(fd, mem)) != NULL) {
@@ -169,7 +169,7 @@ void dump_heap(int fd)
 
         if (allflag || (fflag && free) || (aflag && app) || (tflag && tty)
                     || (bflag && buffer) || (sflag && system)) {
-            printf("  %4x   %s %5d", mem, heaptype[tag], size);
+            printf("  %04x   %s %5d", mem, heaptype[tag], size);
             total_size += size + sizeof(heap_s);
             if (tag == HEAP_TAG_FREE)
                 total_free += size;

libc/string/Makefile

@@ -14,7 +14,6 @@ OBJS = \
 	memmove.o \
 	memset-c.o \
 	fmemset-c.o \
-	movedata.o \
 	strcasecmp.o \
 	strcat.o \
 	strchr.o \

libc/string/memchr.c

@@ -1,48 +1,39 @@
 #include <string.h>
 
-void *
-memchr(const void * str, int c, size_t l)
-{
 #ifdef BCC_ASM
 #asm
-  mov	bx,sp
-  push	di
-
-#ifdef PARANOID
-  push	es
-  push	ds	; Im not sure if this is needed, so just in case.
-  pop	es
+  mov   bx,sp
+  push  di
+  push  es
+  push  ds
+  pop   es
   cld
-#endif
-
-  mov	di,[bx+2]
-  mov	ax,[bx+4]
-  mov	cx,[bx+6]
-  test	cx,cx
-  je	is_z	! Zero length, do not find.
-
-  repne		! Scan
+  mov   di,[bx+2]
+  mov   ax,[bx+4]
+  mov   cx,[bx+6]
+  test  cx,cx
+  je    is_z    ! Zero length, do not find.
+  repne         ! Scan
   scasb
-  jne	is_z	! Not found, ret zero
-  dec	di	! Adjust ptr
-  mov	ax,di	! return
-  jmp	xit
+  jne   is_z    ! Not found, ret zero
+  dec   di      ! Adjust ptr
+  mov   ax,di   ! return
+  jmp   xit
 is_z:
-  xor	ax,ax
+  xor   ax,ax
 xit:
-
-#ifdef PARANOID
-  pop	es
+  pop   es
+  pop   di
+  ret
 #endif
-  pop	di
-#endasm
-#else /* ifdef BCC_ASM */
-   register unsigned char *p=(unsigned char *)str;
-   while(l-- > 0)
-   {
-      if(*p == c) return p;
+
+void *
+memchr(const void * str, int c, size_t l)
+{
+   unsigned char *p = (unsigned char *)str;
+   while (l-- > 0) {
+      if (*p == c) return p;
       p++;
    }
    return 0;
-#endif /* ifdef BCC_ASM */
 }

libc/string/strchr.c

@@ -1,25 +1,12 @@
 #include <string.h>
 
-char *
-strchr (const char * s, int c)
-{
-#ifdef BCC_AX_ASM
-#asm
+#ifdef BCC_ASM
   mov	bx,sp
   push	si
-#if __FIRST_ARG_IN_AX__
-  mov	bx,[bx+2]
-  mov	si,ax
-#else
   mov	si,[bx+2]
   mov	bx,[bx+4]
-#endif
   xor	ax,ax
-
-#ifdef PARANOID
   cld
-#endif
-
 in_loop:
   lodsb
   cmp	al,bl
@@ -31,15 +18,17 @@ strchr (const char * s, int c)
 got_it:
   lea	ax,[si-1]
   pop	si
+  ret
+#endif
 
-#endasm
-#else /* ifdef BCC_AX_ASM */
+char *
+strchr(const char * s, int c)
+{
     for(; *s != (char)c; ++s) {
         if (*s == '\0')
             return NULL;
     }
     return (char *)s;
-#endif /* ifdef BCC_AX_ASM */
 }
 
 #ifdef __GNUC__

libc/string/strncmp.c

@@ -1,59 +1,45 @@
 #include <string.h>
 
-int
-strncmp(const char * d, const char * s, size_t l)
-{
-#ifdef BCC_AX_ASM
-#asm
-  mov	bx,sp
-  push	si
-  push	di
-
-#ifdef PARANOID
-  push	es
-  push	ds	! Im not sure if this is needed, so just in case.
-  pop	es
+#ifdef BCC_ASM
+  mov   bx,sp
+  push  si
+  push  di
+  push  es
+  push  ds
+  pop   es
   cld
-#endif
-
-#if __FIRST_ARG_IN_AX__
-  mov	si,ax
-  mov	di,[bx+2]
-  mov	cx,[bx+4]
-#else
-  mov	si,[bx+2]	! Fetch
-  mov	di,[bx+4]
-  mov	cx,[bx+6]
-#endif
-
-  inc	cx
+  mov   si,[bx+2]       ! Fetch
+  mov   di,[bx+4]
+  mov   cx,[bx+6]
+  inc   cx
 lp1:
-  dec	cx
-  je	lp2
+  dec   cx
+  je    lp2
   lodsb
   scasb
-  jne	lp3
-  testb	al,al
-  jne	lp1
+  jne   lp3
+  testb al,al
+  jne   lp1
 lp2:
-  xor	ax,ax
-  jmp	lp4
+  xor   ax,ax
+  jmp   lp4
 lp3:
-  sbb	ax,ax
-  or	al,#1
+  sbb   ax,ax
+  or    al,#1
 lp4:
-
-#ifdef PARANOID
-  pop	es
+  pop   es
+  pop   di
+  pop   si
+  ret
 #endif
-  pop	di
-  pop	si
-#endasm
-#else
-   register char c1=0, c2=0;
-   while(l-- >0)
-      if( (c1= *d++) != (c2= *s++) || c1 == '\0' )
+
+int
+strncmp(const char * d, const char * s, size_t l)
+{
+   char c1 = 0, c2 = 0;
+   while (l-- > 0) {
+      if ((c1 = *d++) != (c2 = *s++) || c1 == '\0')
          break;
-   return c1-c2;
-#endif
+   }
+   return c1 - c2;
 }