Changes in / [47a728e1:23db8aa] in mainline

Files:

• boot/arch/mips32/Makefile.inc (modified) (2 diffs)
• boot/arch/mips64/Makefile.inc (modified) (2 diffs)
• boot/generic/src/str.c (modified) (1 diff)
• contrib/bazaar/bzreml/__init__.py (modified) (4 diffs)
• contrib/bazaar/bzreml/setup.py (modified) (2 diffs)
• contrib/conf/mips32-gx.sh (modified) (1 diff)
• defaults/mips32/Makefile.config (modified) (1 diff)
• kernel/arch/mips32/Makefile.inc (modified) (2 diffs)
• kernel/arch/mips64/Makefile.inc (modified) (2 diffs)
• kernel/generic/src/lib/str.c (modified) (3 diffs)
• uspace/app/sportdmp/sportdmp.c (modified) (2 diffs)
• uspace/lib/c/arch/abs32le/_link.ld.in (modified) (1 diff)
• uspace/lib/c/arch/amd64/_link.ld.in (modified) (1 diff)
• uspace/lib/c/arch/arm32/_link.ld.in (modified) (1 diff)
• uspace/lib/c/arch/arm32/src/fibril.S (modified) (2 diffs)
• uspace/lib/c/arch/arm32/src/stacktrace_asm.S (modified) (1 diff)
• uspace/lib/c/arch/arm32/src/thread_entry.s (modified) (1 diff)
• uspace/lib/c/arch/ia32/_link.ld.in (modified) (4 diffs)
• uspace/lib/c/arch/ia64/_link.ld.in (modified) (1 diff)
• uspace/lib/c/arch/mips32/Makefile.common (modified) (1 diff)
• uspace/lib/c/arch/mips32/_link.ld.in (modified) (1 diff)
• uspace/lib/c/arch/mips32eb/Makefile.common (modified) (1 diff)
• uspace/lib/c/arch/mips64/Makefile.common (modified) (1 diff)
• uspace/lib/c/arch/mips64/_link.ld.in (modified) (1 diff)
• uspace/lib/c/arch/ppc32/_link.ld.in (modified) (1 diff)
• uspace/lib/c/arch/sparc64/_link.ld.in (modified) (1 diff)
• uspace/lib/c/generic/str.c (modified) (5 diffs)
• uspace/lib/c/include/str.h (modified) (1 diff)
• uspace/lib/clui/tinput.c (modified) (1 diff)
• uspace/srv/loader/interp.S (modified) (1 diff)

boot/arch/mips32/Makefile.inc

@@ -29 +29 @@
 BFD_ARCH = mips
 BITS = 32
-EXTRA_CFLAGS = -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32
+EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32
 
 RD_SRVS_NON_ESSENTIAL += \
@@ -48 +48 @@
         BFD_OUTPUT = binary
         ENDIANESS = LE
+        EXTRA_GCC_CFLAGS = -mhard-float
 endif
 

boot/arch/mips64/Makefile.inc

@@ -29 +29 @@
 BFD_ARCH = mips:4000
 BITS = 64
-EXTRA_CFLAGS = -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=64
+EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=64
 
 ifeq ($(MACHINE),msim)
@@ -35 +35 @@
         BFD_OUTPUT = binary
         ENDIANESS = LE
+        EXTRA_GCC_CFLAGS = -mhard-float
 endif
 

boot/generic/src/str.c

@@ -354 +354 @@
  *
  * Do a char-by-char comparison of two NULL-terminated strings.
- * The strings are considered equal iff their length is equal
- * and both strings consist of the same sequence of characters.
- *
- * A string S1 is less than another string S2 if it has a character with
- * lower value at the first character position where the strings differ.
- * If the strings differ in length, the shorter one is treated as if
- * padded by characters with a value of zero.
+ * The strings are considered equal iff they consist of the same
+ * characters on the minimum of their lengths.
  *
  * @param s1 First string to compare.
  * @param s2 Second string to compare.
  *
- * @return 0 if the strings are equal, -1 if the first is less than the second,
- *         1 if the second is less than the first.
+ * @return 0 if the strings are equal, -1 if first is smaller,
+ *         1 if second smaller.
  *
  */

contrib/bazaar/bzreml/__init__.py

@@ -108 +108 @@
                 if (revision_ac_id == revision_old_id):
                         break
-                
                 yield revision_ac_id
 
@@ -118 +117 @@
                 branch.repository.lock_read()
                 try:
-                        revision_prev_id = revision_old_id
-                        
-                        for revision_ac_id in reversed(list(revision_sequence(branch, revision_old_id, revision_new_id))):
-                                body = StringIO()
-                                
+                        body = StringIO()
+                        
+                        for revision_ac_id in revision_sequence(branch, revision_old_id, revision_new_id):
                                 revision_ac = branch.repository.get_revision(revision_ac_id)
                                 revision_ac_no = branch.revision_id_to_revno(revision_ac_id)
@@ -142 +139 @@
                                 body.write("\n")
                                 
-                                commit_message = None
+                                commit_message = ""
                                 body.write("Log:\n")
                                 if (not revision_ac.message):
@@ -150 +147 @@
                                         for line in log.split("\n"):
                                                 body.write("%s\n" % line)
-                                                if (commit_message == None):
+                                                if (commit_message == ""):
                                                         commit_message = line
                                 
-                                if (commit_message == None):
+                                if (commit_message == ""):
                                         commit_message = "(empty)"
                                 
                                 body.write("\n")
-                                
-                                tree_prev = branch.repository.revision_tree(revision_prev_id)
-                                tree_ac = branch.repository.revision_tree(revision_ac_id)
-                                
-                                delta = tree_ac.changes_from(tree_prev)
-                                
-                                if (len(delta.added) > 0):
-                                        body.write("Added:\n")
-                                        for item in delta.added:
-                                                body.write("    %s\n" % item[0])
-                                
-                                if (len(delta.removed) > 0):
-                                        body.write("Removed:\n")
-                                        for item in delta.removed:
-                                                body.write("    %s\n" % item[0])
-                                
-                                if (len(delta.renamed) > 0):
-                                        body.write("Renamed:\n")
-                                        for item in delta.renamed:
-                                                body.write("    %s -> %s\n" % (item[0], item[1]))
-                                
-                                if (len(delta.kind_changed) > 0):
-                                        body.write("Changed:\n")
-                                        for item in delta.kind_changed:
-                                                body.write("    %s\n" % item[0])
-                                
-                                if (len(delta.modified) > 0):
-                                        body.write("Modified:\n")
-                                        for item in delta.modified:
-                                                body.write("    %s\n" % item[0])
-                                
-                                body.write("\n")
-                                
-                                tree_prev.lock_read()
+                        
+                        tree_old = branch.repository.revision_tree(revision_old_id)
+                        tree_new = branch.repository.revision_tree(revision_new_id)
+                        
+                        revision_new_no = branch.revision_id_to_revno(revision_new_id)
+                        delta = tree_new.changes_from(tree_old)
+                        
+                        if (len(delta.added) > 0):
+                                body.write("Added:\n")
+                                for item in delta.added:
+                                        body.write("    %s\n" % item[0])
+                        
+                        if (len(delta.removed) > 0):
+                                body.write("Removed:\n")
+                                for item in delta.removed:
+                                        body.write("    %s\n" % item[0])
+                        
+                        if (len(delta.renamed) > 0):
+                                body.write("Renamed:\n")
+                                for item in delta.renamed:
+                                        body.write("    %s -> %s\n" % (item[0], item[1]))
+                        
+                        if (len(delta.kind_changed) > 0):
+                                body.write("Changed:\n")
+                                for item in delta.kind_changed:
+                                        body.write("    %s\n" % item[0])
+                        
+                        if (len(delta.modified) > 0):
+                                body.write("Modified:\n")
+                                for item in delta.modified:
+                                        body.write("    %s\n" % item[0])
+                        
+                        body.write("\n")
+                        
+                        tree_old.lock_read()
+                        try:
+                                tree_new.lock_read()
                                 try:
-                                        tree_ac.lock_read()
-                                        try:
-                                                diff = DiffTree.from_trees_options(tree_prev, tree_ac, body, "utf8", None, "", "", None)
-                                                diff.show_diff(None, None)
-                                        finally:
-                                                tree_ac.unlock()
+                                        diff = DiffTree.from_trees_options(tree_old, tree_new, body, "utf8", None, "", "", None)
+                                        diff.show_diff(None, None)
                                 finally:
-                                        tree_prev.unlock()
-                                
-                                subject = "r%d - %s" % (revision_ac_no, commit_message)
-                                send_smtp("localhost", config_sender(config), config_to(config), subject, body.getvalue())
-                                
-                                revision_prev_id = revision_ac_id
-                        
+                                        tree_new.unlock()
+                        finally:
+                                tree_old.unlock()
+                        
+                        subject = "r%d - %s" % (revision_new_no, commit_message)
+                        
+                        send_smtp("localhost", config_sender(config), config_to(config), subject, body.getvalue())
                 finally:
                         branch.repository.unlock()

contrib/bazaar/bzreml/setup.py

@@ -7 +7 @@
         description = 'Commit email plugin for Bazaar',
         keywords = 'plugin bzr email',
-        version = '1.3',
+        version = '1.2',
         url = 'http://www.decky.cz/',
         license = 'BSD',
@@ -13 +13 @@
         author_email = 'martin@decky.cz',
         long_description = """Hooks into Bazaar and sends commit notification emails.""",
-        package_dir = {'bzrlib.plugins.eml':'.'},
+        package_dir = {'bzrlib.plugins.eml':'.'}, 
         packages = ['bzrlib.plugins.eml']
 )

contrib/conf/mips32-gx.sh

@@ -8 +8 @@
 fi
 
-if [ "$1" == "-E" ] && [ -n "$2" ]; then
-        MACHINE="$2"
-        shift 2
-else
-        MACHINE="oldtestmips"
-fi
-
-gxemul $@ -E "$MACHINE" -C R4000 -X image.boot -d d0:"$DISK_IMG"
+gxemul $@ -E oldtestmips -C R4000 -X image.boot -d d0:"$DISK_IMG"

defaults/mips32/Makefile.config

@@ -47 +47 @@
 CONFIG_MOUNT_DATA = n
 
-# Barebone build with essential binaries only 
-CONFIG_BAREBONE = y

kernel/arch/mips32/Makefile.inc

@@ -29 +29 @@
 BFD_ARCH = mips
 BFD = binary
-GCC_CFLAGS += -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32
+GCC_CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32
 
 BITS = 32
@@ -48 +48 @@
         BFD_NAME = elf32-tradlittlemips
         ENDIANESS = LE
+        GCC_CFLAGS += -mhard-float
 endif
 

kernel/arch/mips64/Makefile.inc

@@ -29 +29 @@
 BFD_ARCH = mips:4000
 BFD = binary
-GCC_CFLAGS += -msoft-float -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=64
+GCC_CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=64
 AFLAGS = -64
 
@@ -40 +40 @@
         BFD_NAME = elf64-tradlittlemips
         ENDIANESS = LE
+        GCC_CFLAGS += -mhard-float
 endif
 

kernel/generic/src/lib/str.c

@@ -456 +456 @@
  *
  * Do a char-by-char comparison of two NULL-terminated strings.
- * The strings are considered equal iff their length is equal
- * and both strings consist of the same sequence of characters.
- *
- * A string S1 is less than another string S2 if it has a character with
- * lower value at the first character position where the strings differ.
- * If the strings differ in length, the shorter one is treated as if
- * padded by characters with a value of zero.
+ * The strings are considered equal iff they consist of the same
+ * characters on the minimum of their lengths.
  *
  * @param s1 First string to compare.
  * @param s2 Second string to compare.
  *
- * @return 0 if the strings are equal, -1 if the first is less than the second,
- *         1 if the second is less than the first.
+ * @return 0 if the strings are equal, -1 if first is smaller,
+ *         1 if second smaller.
  *
  */
@@ -499 +494 @@
  *
  * Do a char-by-char comparison of two NULL-terminated strings.
- * The strings are considered equal iff
- * min(str_length(s1), max_len) == min(str_length(s2), max_len)
- * and both strings consist of the same sequence of characters,
- * up to max_len characters.
- *
- * A string S1 is less than another string S2 if it has a character with
- * lower value at the first character position where the strings differ.
- * If the strings differ in length, the shorter one is treated as if
- * padded by characters with a value of zero. Only the first max_len
- * characters are considered.
+ * The strings are considered equal iff they consist of the same
+ * characters on the minimum of their lengths and the length limit.
  *
  * @param s1      First string to compare.
@@ -514 +501 @@
  * @param max_len Maximum number of characters to consider.
  *
- * @return 0 if the strings are equal, -1 if the first is less than the second,
- *         1 if the second is less than the first.
+ * @return 0 if the strings are equal, -1 if first is smaller,
+ *         1 if second smaller.
  *
  */

uspace/app/sportdmp/sportdmp.c

@@ -37 +37 @@
 static void syntax_print(void)
 {
-        fprintf(stderr, "Usage: sportdmp [--baud=<baud>] [device_service]\n");
+        fprintf(stderr, "Usage: sportdmp <baud> <device_service>\n");
 }
 
 int main(int argc, char **argv)
 {
+        const char* svc_path = "devices/\\hw\\pci0\\00:01.0\\com1\\a";
         sysarg_t baud = 9600;
-        service_id_t svc_id;
         
-        int arg = 1;
-        int rc;
-                
-        if (argc > arg && str_test_prefix(argv[arg], "--baud=")) {
-                size_t arg_offset = str_lsize(argv[arg], 7);
-                char* arg_str = argv[arg] + arg_offset;
-                if (str_length(arg_str) == 0) {
-                        fprintf(stderr, "--baud requires an argument\n");
-                        syntax_print();
-                        return 1;
-                }
+        if (argc > 1) {
                 char *endptr;
-                baud = strtol(arg_str, &endptr, 10);
+                baud = strtol(argv[1], &endptr, 10);
                 if (*endptr != '\0') {
                         fprintf(stderr, "Invalid value for baud\n");
@@ -63 +53 @@
                         return 1;
                 }
-                arg++;
         }
         
-        if (argc > arg) {
-                rc = loc_service_get_id(argv[arg], &svc_id, 0);
-                if (rc != EOK) {
-                        fprintf(stderr, "Cannot find device service %s\n",
-                            argv[arg]);
-                        return 1;
-                }
-                arg++;
-        }
-        else {
-                category_id_t serial_cat_id;
-                
-                rc = loc_category_get_id("serial", &serial_cat_id, 0);
-                if (rc != EOK) {
-                        fprintf(stderr, "Failed getting id of category "
-                            "'serial'\n");
-                        return 1;
-                }
-                
-                service_id_t *svc_ids;
-                size_t svc_count;
-                
-                rc = loc_category_get_svcs(serial_cat_id, &svc_ids, &svc_count);                if (rc != EOK) {
-                        fprintf(stderr, "Failed getting list of services\n");
-                        return 1;
-                }
-                
-                if (svc_count == 0) {
-                        fprintf(stderr, "No service in category 'serial'\n");
-                        free(svc_ids);
-                        return 1;
-                }
-                
-                svc_id = svc_ids[0];
-                free(svc_ids);
+        if (argc > 2) {
+                svc_path = argv[2];
         }
         
-        if (argc > arg) {
-                fprintf(stderr, "Too many arguments\n");
+        if (argc > 3) {
                 syntax_print();
                 return 1;
         }
         
+        service_id_t svc_id;
+        int rc = loc_service_get_id(svc_path, &svc_id, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                fprintf(stderr, "Cannot find device service %s\n", svc_path);
+                return 1;
+        }
         
         async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE, svc_id,
             IPC_FLAG_BLOCKING);
         if (!sess) {
-                fprintf(stderr, "Failed connecting to service\n");
+                fprintf(stderr, "Failed connecting to service %s\n", svc_path);
         }
         

uspace/lib/c/arch/abs32le/_link.ld.in

@@ -14 +14 @@
 SECTIONS {
 #ifdef LOADER
-        . = 0x70001000 + SIZEOF_HEADERS;
-        
         .interp : {
                 *(.interp);
-        } :interp :text
+        } :interp
+        
+        . = 0x70001000 + SIZEOF_HEADERS;
 #else
         . = 0x1000 + SIZEOF_HEADERS;
 #endif
-        
-        /* Make sure the code is aligned reasonably */
-        . = ALIGN(., 16);
-        
         .text : {
                 *(.text .text.*);

uspace/lib/c/arch/amd64/_link.ld.in

@@ -15 +15 @@
 SECTIONS {
 #ifdef LOADER
-        . = 0x70001000 + SIZEOF_HEADERS;
-        
         .interp : {
                 *(.interp);
-        } :interp :text
+        } :interp
+        
+        . = 0x70001000 + SIZEOF_HEADERS;
 #else
         . = 0x1000 + SIZEOF_HEADERS;
 #endif
-        
-        /* Make sure the code is aligned reasonably */
-        . = ALIGN(., 16);
-        
         .init : {
                 *(.init);

uspace/lib/c/arch/arm32/_link.ld.in

@@ -14 +14 @@
 SECTIONS {
 #ifdef LOADER
-        . = 0x70001000 + SIZEOF_HEADERS;
-        
         .interp : {
                 *(.interp);
-        } :interp :text
+        } :interp
+        
+        . = 0x70001000 + SIZEOF_HEADERS;
 #else
         . = 0x1000 + SIZEOF_HEADERS;
 #endif
-        
-        /* Make sure the code is aligned reasonably */
-        . = ALIGN(., 8);
-        
         .init : {
                 *(.init);

uspace/lib/c/arch/arm32/src/fibril.S

@@ -35 +35 @@
         stmia r0!, {sp, lr}
         stmia r0!, {r4-r11}
-        
+
         # return 1
         mov r0, #1
@@ -43 +43 @@
         ldmia r0!, {sp, lr}
         ldmia r0!, {r4-r11}
-        
-        # return 0
+
+        #return 0
         mov r0, #0
         mov pc, lr

uspace/lib/c/arch/arm32/src/stacktrace_asm.S

@@ -41 +41 @@
 
 stacktrace_pc_get:
-        mov r0, lr
+        mov r0, lr 
         mov pc, lr

uspace/lib/c/arch/arm32/src/thread_entry.s

@@ -42 +42 @@
         push {fp, ip, lr, pc}
         sub fp, ip, #4
-        
-        b __thread_main
+
+        b __thread_main

uspace/lib/c/arch/ia32/_link.ld.in

@@ -19 +19 @@
 
 SECTIONS {
+#if defined(LOADER) || defined(DLEXE)
+        .interp : {
+                *(.interp);
+        } :interp
+#endif
 #ifdef LOADER
         . = 0x70001000 + SIZEOF_HEADERS;
@@ -24 +29 @@
         . = 0x1000 + SIZEOF_HEADERS;
 #endif
-        
-#if defined(LOADER) || defined(DLEXE)
-        .interp : {
-                *(.interp);
-        } :interp :text
-#endif
-        
-        /* Make sure the code is aligned reasonably */
-        . = ALIGN(., 16);
-        
         .init : {
                 *(.init);
@@ -42 +37 @@
                 *(.rodata .rodata.*);
         } :text
-        
+
 #if defined(SHLIB) || defined(DLEXE)
         .rel.plt : {
@@ -85 +80 @@
 #if defined(SHLIB) || defined(DLEXE)
         .data.rel : {
-                *(.data.rel .data.rel.*);
+                *(.data.rel .data.rel.*);
         } :data
-        
+
         .got : {
-                *(.got);
+                *(.got);
         } :data
-        
         .got.plt : {
-                *(.got.plt);
+                *(.got.plt);
         } :data
 #endif

uspace/lib/c/arch/ia64/_link.ld.in

@@ -14 +14 @@
 SECTIONS {
 #ifdef LOADER
-        . = 0x800000000 + SIZEOF_HEADERS;
-        
         .interp : {
                 *(.interp);
-        } :interp :text
+        } :interp
+        
+        . = 0x800000000 + SIZEOF_HEADERS;
 #else
         . = 0x4000 + SIZEOF_HEADERS;
 #endif
-        
-        /* Make sure the code is aligned reasonably */
+        /*
+         * XXX This is just a work around. Problem: .init section does not
+         * have the proper alignment.
+         */
         . = ALIGN(., 16);
-        
+
         .init : {
                 *(.init);

uspace/lib/c/arch/mips32/Makefile.common

@@ -27 +27 @@
 #
 
-GCC_CFLAGS += -msoft-float -mips3 -mabi=32
+GCC_CFLAGS += -mips3 -mabi=32
 
 ENDIANESS = LE

uspace/lib/c/arch/mips32/_link.ld.in

@@ -14 +14 @@
 SECTIONS {
 #ifdef LOADER
-        . = 0x70004000 + SIZEOF_HEADERS;
-        
         .interp : {
                 *(.interp);
-        } :interp :text
+        } :interp
+        
+        . = 0x70004000 + SIZEOF_HEADERS;
 #else
         . = 0x4000 + SIZEOF_HEADERS;
 #endif
-        
-        /* Make sure the code is aligned reasonably */
-        . = ALIGN(., 16);
-        
         .init : {
                 *(.init);

uspace/lib/c/arch/mips32eb/Makefile.common

@@ -27 +27 @@
 #
 
-GCC_CFLAGS += -msoft-float -mips3 -mabi=32
+GCC_CFLAGS += -mips3 -mabi=32
 
 ENDIANESS = BE

uspace/lib/c/arch/mips64/Makefile.common

@@ -27 +27 @@
 #
 
-GCC_CFLAGS += -msoft-float -mips3 -mabi=64
+GCC_CFLAGS += -mips3 -mabi=64
 AFLAGS = -64
 

uspace/lib/c/arch/mips64/_link.ld.in

@@ -15 +15 @@
 SECTIONS {
 #ifdef LOADER
-        . = 0x70004000 + SIZEOF_HEADERS;
-        
         .interp : {
                 *(.interp);
-        } :interp :text
+        } :interp
+        
+        . = 0x70004000 + SIZEOF_HEADERS;
 #else
         . = 0x4000 + SIZEOF_HEADERS;
 #endif
-        
-        /* Make sure the code is aligned reasonably */
-        . = ALIGN(., 16);
-        
         .init : {
                 *(.init);

uspace/lib/c/arch/ppc32/_link.ld.in

@@ -15 +15 @@
 SECTIONS {
 #ifdef LOADER
-        . = 0x70001000 + SIZEOF_HEADERS;
-        
         .interp : {
                 *(.interp);
-        } :interp :text
+        } :interp
+        
+        . = 0x70001000 + SIZEOF_HEADERS;
 #else
         . = 0x1000 + SIZEOF_HEADERS;
 #endif
-        
-        /* Make sure the code is aligned reasonably */
-        . = ALIGN(., 4);
-        
         .init : {
                 *(.init);

uspace/lib/c/arch/sparc64/_link.ld.in

@@ -14 +14 @@
 SECTIONS {
 #ifdef LOADER
-        . = 0x70004000 + SIZEOF_HEADERS;
-        
         .interp : {
                 *(.interp);
-        } :interp :text
+        } :interp
+        
+        . = 0x70004000 + SIZEOF_HEADERS;
 #else
         . = 0x4000 + SIZEOF_HEADERS;
 #endif
-        
-        /* Make sure the code is aligned reasonably */
-        . = ALIGN(., 16);
-        
         .init : {
                 *(.init);

uspace/lib/c/generic/str.c

@@ -428 +428 @@
  *
  * Do a char-by-char comparison of two NULL-terminated strings.
- * The strings are considered equal iff their length is equal
- * and both strings consist of the same sequence of characters.
- *
- * A string S1 is less than another string S2 if it has a character with
- * lower value at the first character position where the strings differ.
- * If the strings differ in length, the shorter one is treated as if
- * padded by characters with a value of zero.
+ * The strings are considered equal iff they consist of the same
+ * characters on the minimum of their lengths.
  *
  * @param s1 First string to compare.
  * @param s2 Second string to compare.
  *
- * @return 0 if the strings are equal, -1 if the first is less than the second,
- *         1 if the second is less than the first.
+ * @return 0 if the strings are equal, -1 if first is smaller,
+ *         1 if second smaller.
  *
  */
@@ -471 +466 @@
  *
  * Do a char-by-char comparison of two NULL-terminated strings.
- * The strings are considered equal iff
- * min(str_length(s1), max_len) == min(str_length(s2), max_len)
- * and both strings consist of the same sequence of characters,
- * up to max_len characters.
- *
- * A string S1 is less than another string S2 if it has a character with
- * lower value at the first character position where the strings differ.
- * If the strings differ in length, the shorter one is treated as if
- * padded by characters with a value of zero. Only the first max_len
- * characters are considered.
+ * The strings are considered equal iff they consist of the same
+ * characters on the minimum of their lengths and the length limit.
  *
  * @param s1      First string to compare.
@@ -486 +473 @@
  * @param max_len Maximum number of characters to consider.
  *
- * @return 0 if the strings are equal, -1 if the first is less than the second,
- *         1 if the second is less than the first.
+ * @return 0 if the strings are equal, -1 if first is smaller,
+ *         1 if second smaller.
  *
  */
@@ -521 +508 @@
         return 0;
 
-}
-
-/** Test whether p is a prefix of s.
- *
- * Do a char-by-char comparison of two NULL-terminated strings
- * and determine if p is a prefix of s.
- *
- * @param s The string in which to look
- * @param p The string to check if it is a prefix of s
- *
- * @return true iff p is prefix of s else false
- *
- */
-bool str_test_prefix(const char *s, const char *p)
-{
-        wchar_t c1 = 0;
-        wchar_t c2 = 0;
-        
-        size_t off1 = 0;
-        size_t off2 = 0;
-
-        while (true) {
-                c1 = str_decode(s, &off1, STR_NO_LIMIT);
-                c2 = str_decode(p, &off2, STR_NO_LIMIT);
-                
-                if (c2 == 0)
-                        return true;
-
-                if (c1 != c2)
-                        return false;
-                
-                if (c1 == 0)
-                        break;
-        }
-
-        return false;
 }
 
@@ -1134 +1085 @@
                 c = (c >= 'a' ? c - 'a' + 10 : (c >= 'A' ? c - 'A' + 10 :
                     (c <= '9' ? c - '0' : 0xff)));
-                if (c >= base) {
+                if (c > base) {
                         break;
                 }

uspace/lib/c/include/str.h

@@ -79 +79 @@
 extern int str_lcmp(const char *s1, const char *s2, size_t max_len);
 
-extern bool str_test_prefix(const char *s, const char *p);
-
 extern void str_cpy(char *dest, size_t size, const char *src);
 extern void str_ncpy(char *dest, size_t size, const char *src, size_t n);

uspace/lib/clui/tinput.c

@@ -601 +601 @@
         
         unsigned int cols = max(1, (ti->con_cols + 1) / (max_length + 1));
-        unsigned int padding = 0;
-        if ((cols * max_length) + (cols - 1) < ti->con_cols) {
-                padding = ti->con_cols - (cols * max_length) - (cols - 1);
-        }
-        unsigned int col_width = max_length + padding / cols;
+        unsigned int col_width = ti->con_cols / cols;
         unsigned int rows = cnum / cols + ((cnum % cols) != 0);
         

uspace/srv/loader/interp.S

@@ -5 +5 @@
 #
 
-#if ((defined(UARCH_abs32le)) && (defined(COMPILER_gcc_cross)) \
-    && (defined(CROSS_TARGET_arm32)))
-        #define ATSIGN(arg)  % ## arg
+#ifdef UARCH_arm32
+#define AT_NOTE %note
+#else
+#define AT_NOTE @note
 #endif
 
-#ifdef UARCH_arm32
-        #define ATSIGN(arg)  % ## arg
-#endif
-
-#ifndef ATSIGN
-        #define ATSIGN(arg)  @ ## arg
-#endif
-
-.section .interp, "a", ATSIGN(progbits)
+.section .interp, "a", AT_NOTE
         .string "kernel"