Changeset bd29f9c9 in mainline for uspace

Timestamp:

2012-07-30T20:01:02Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

542e819, beb9336

Parents:

c15849c (diff), 597b12e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

Location:

uspace

Files:

• app/sportdmp/sportdmp.c (modified) (2 diffs)
• lib/c/arch/abs32le/_link.ld.in (modified) (1 diff)
• lib/c/arch/amd64/_link.ld.in (modified) (1 diff)
• lib/c/arch/arm32/_link.ld.in (modified) (1 diff)
• lib/c/arch/ia32/_link.ld.in (modified) (2 diffs)
• lib/c/arch/ia64/_link.ld.in (modified) (2 diffs)
• lib/c/arch/mips32/_link.ld.in (modified) (1 diff)
• lib/c/arch/mips64/_link.ld.in (modified) (1 diff)
• lib/c/arch/ppc32/_link.ld.in (modified) (1 diff)
• lib/c/arch/sparc64/_link.ld.in (modified) (1 diff)
• lib/c/generic/str.c (modified) (3 diffs)
• lib/c/include/str.h (modified) (1 diff)
• lib/clui/tinput.c (modified) (1 diff)
• srv/loader/interp.S (modified) (1 diff)

uspace/app/sportdmp/sportdmp.c

@@ -37 +37 @@
 static void syntax_print(void)
 {
-        fprintf(stderr, "Usage: sportdmp <baud> <device_service>\n");
+        fprintf(stderr, "Usage: sportdmp [--baud=<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;
         
-        if (argc > 1) {
+        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;
+                }
                 char *endptr;
-                baud = strtol(argv[1], &endptr, 10);
+                baud = strtol(arg_str, &endptr, 10);
                 if (*endptr != '\0') {
                         fprintf(stderr, "Invalid value for baud\n");
@@ -53 +63 @@
                         return 1;
                 }
+                arg++;
         }
         
-        if (argc > 2) {
-                svc_path = argv[2];
+        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 > 3) {
+        if (argc > arg) {
+                fprintf(stderr, "Too many arguments\n");
                 syntax_print();
                 return 1;
         }
         
-        service_id_t svc_id;
-        int rc = loc_service_get_id(svc_path, &svc_id, 0);
-        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 %s\n", svc_path);
+                fprintf(stderr, "Failed connecting to service\n");
         }
         

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

@@ -14 +14 @@
 SECTIONS {
 #ifdef LOADER
+        . = 0x70001000 + SIZEOF_HEADERS;
+        
         .interp : {
                 *(.interp);
-        } :interp
-        
-        . = 0x70001000 + SIZEOF_HEADERS;
+        } :interp :text
 #else
         . = 0x1000 + SIZEOF_HEADERS;
 #endif
+        
         .text : {
                 *(.text .text.*);

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

@@ -15 +15 @@
 SECTIONS {
 #ifdef LOADER
+        . = 0x70001000 + SIZEOF_HEADERS;
+        
         .interp : {
                 *(.interp);
-        } :interp
-        
-        . = 0x70001000 + SIZEOF_HEADERS;
+        } :interp :text
 #else
         . = 0x1000 + SIZEOF_HEADERS;
 #endif
+        
         .init : {
                 *(.init);

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

@@ -14 +14 @@
 SECTIONS {
 #ifdef LOADER
+        . = 0x70001000 + SIZEOF_HEADERS;
+        
         .interp : {
                 *(.interp);
-        } :interp
-        
-        . = 0x70001000 + SIZEOF_HEADERS;
+        } :interp :text
 #else
         . = 0x1000 + SIZEOF_HEADERS;
 #endif
+        
         .init : {
                 *(.init);

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;
@@ -29 +24 @@
         . = 0x1000 + SIZEOF_HEADERS;
 #endif
+        
+#if defined(LOADER) || defined(DLEXE)
+        .interp : {
+                *(.interp);
+        } :interp :text
+#endif
+        
         .init : {
                 *(.init);

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

@@ -14 +14 @@
 SECTIONS {
 #ifdef LOADER
+        . = 0x800000000 + SIZEOF_HEADERS;
+        
         .interp : {
                 *(.interp);
-        } :interp
-        
-        . = 0x800000000 + SIZEOF_HEADERS;
+        } :interp :text
 #else
         . = 0x4000 + SIZEOF_HEADERS;
 #endif
+        
         /*
          * XXX This is just a work around. Problem: .init section does not
@@ -27 +28 @@
          */
         . = ALIGN(., 16);
-
+        
         .init : {
                 *(.init);

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

@@ -14 +14 @@
 SECTIONS {
 #ifdef LOADER
+        . = 0x70004000 + SIZEOF_HEADERS;
+        
         .interp : {
                 *(.interp);
-        } :interp
-        
-        . = 0x70004000 + SIZEOF_HEADERS;
+        } :interp :text
 #else
         . = 0x4000 + SIZEOF_HEADERS;
 #endif
+        
         .init : {
                 *(.init);

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

@@ -15 +15 @@
 SECTIONS {
 #ifdef LOADER
+        . = 0x70004000 + SIZEOF_HEADERS;
+        
         .interp : {
                 *(.interp);
-        } :interp
-        
-        . = 0x70004000 + SIZEOF_HEADERS;
+        } :interp :text
 #else
         . = 0x4000 + SIZEOF_HEADERS;
 #endif
+        
         .init : {
                 *(.init);

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

@@ -15 +15 @@
 SECTIONS {
 #ifdef LOADER
+        . = 0x70001000 + SIZEOF_HEADERS;
+        
         .interp : {
                 *(.interp);
-        } :interp
-        
-        . = 0x70001000 + SIZEOF_HEADERS;
+        } :interp :text
 #else
         . = 0x1000 + SIZEOF_HEADERS;
 #endif
+        
         .init : {
                 *(.init);

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

@@ -14 +14 @@
 SECTIONS {
 #ifdef LOADER
+        . = 0x70004000 + SIZEOF_HEADERS;
+        
         .interp : {
                 *(.interp);
-        } :interp
-        
-        . = 0x70004000 + SIZEOF_HEADERS;
+        } :interp :text
 #else
         . = 0x4000 + SIZEOF_HEADERS;
 #endif
+        
         .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 they consist of the same
- * characters on the minimum of their lengths.
+ * The strings are considered equal iff their length is equal
+ * and both strings consist of the same sequence of characters.
+ *
+ * A string is smaller than another string iff it is shorter or
+ * has a character with lower value at the first position where
+ * the strings differ.
  *
  * @param s1 First string to compare.
@@ -466 +470 @@
  *
  * Do a char-by-char comparison of two NULL-terminated strings.
- * The strings are considered equal iff they consist of the same
- * characters on the minimum of their lengths and the length limit.
+ * 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 is smaller than another string iff it is shorter or
+ * has a character with lower value at the first position where
+ * the strings differ, considering only first max_len characters.
  *
  * @param s1      First string to compare.
@@ -508 +518 @@
         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;
 }
 

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 col_width = ti->con_cols / cols;
+        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 rows = cnum / cols + ((cnum % cols) != 0);
         

uspace/srv/loader/interp.S

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