Changeset 1659

Timestamp:

02/10/12 23:04:06 (16 months ago)

Author:

philmoz

Message:

Small change to the finsig_dryos / finsig_vxworks code.
Output filename is now a parameter rather than using STDOUT.
STDOUT is used for info messages (e.g. time taken) and STDERR for error messages.
This prevents the time taken message from appearing in the CHDK-Shell error log.

Location:

branches/release-1_0

Files:

• platform/makefile_sub.inc (modified) (1 diff)
• tools/finsig_dryos.c (modified) (5 diffs)
• tools/finsig_vxworks.c (modified) (7 diffs)

branches/release-1_0/platform/makefile_sub.inc

@@ -45 +45 @@
         rm -f stubs_entry.S.err
         if [ -s $(TARGET_PRIMARY) ] ; then \
-          $(topdir)tools/finsig_$(PLATFORMOS) $(TARGET_PRIMARY) $(ROMBASEADDR) > stubs_entry.S ; \
+          $(topdir)tools/finsig_$(PLATFORMOS) $(TARGET_PRIMARY) $(ROMBASEADDR) stubs_entry.S ; \
         else \
           echo CAUTION! \'stubs_entry.S\' is not updated due to target firmware binary not found! ; \

branches/release-1_0/tools/finsig_dryos.c

@@ -22 +22 @@
 // Buffer output into header and body sections
 
+FILE    *out_fp;
 char    out_buf[32*1024] = "";
 int             out_len = 0;
@@ -53 +54 @@
 {
         add_blankline();
-        printf("%s",hdr_buf);
-        printf("%s",out_buf);
+    if (out_fp)
+    {
+            fprintf(out_fp,"%s",hdr_buf);
+        fprintf(out_fp,"%s",out_buf);
+    }
 }
 
@@ -61 +65 @@
 void usage(char *err)
 {
-    printf("finsig <primary> <base> - Error = %s\n",err);
+    bprintf("finsig <primary> <base> <outputfilename> - Error = %s\n",err);
+    write_output();
+    fprintf(stderr,"finsig <primary> <base> <outputfilename> - Error = %s\n",err);
     exit(1);
 }
@@ -3791 +3797 @@
     clock_t t1 = clock();
 
-    if (argc != 3)
+    if (argc != 4)
         usage("args");
+
+    out_fp = fopen(argv[3],"w");
+    if (out_fp == NULL) usage("failed to open outputfile");
 
     //load_ignore_list();
@@ -3874 +3883 @@
     find_other_vals(&fw);
 
-    fprintf(stderr,"Time to generate stubs %.2f seconds\n",(double)(t2-t1)/(double)CLOCKS_PER_SEC);
+    printf("Time to generate stubs %.2f seconds\n",(double)(t2-t1)/(double)CLOCKS_PER_SEC);
         
         write_output();
         
+    fclose(out_fp);
+
     return ret;
 }

branches/release-1_0/tools/finsig_vxworks.c

@@ -89 +89 @@
 }
 
+FILE *out_fp;
+
 void usage()
 {
-    printf("finsig <primary> <base>\n");
+    if (out_fp) fprintf(out_fp,"finsig <primary> <base> <outputfilename>\n");
+    fprintf(stderr,"finsig <primary> <base> <outputfilename>\n");
     exit(1);
 }
@@ -112 +115 @@
     clock_t t1 = clock();
 
-    if (argc != 3)
+    if (argc != 4)
         usage();
+
+    out_fp = fopen(argv[3],"w");
+    if (out_fp == NULL) usage();
 
     f = fopen(argv[1], "r+b");
@@ -122 +128 @@
     base = strtoul(argv[2], NULL, 0);
 
-    printf("// !!! THIS FILE IS GENERATED. DO NOT EDIT. !!!\n");
-    printf("#include \"stubs_asm.h\"\n\n");
+    fprintf(out_fp,"// !!! THIS FILE IS GENERATED. DO NOT EDIT. !!!\n");
+    fprintf(out_fp,"#include \"stubs_asm.h\"\n\n");
 
     fseek(f,0,SEEK_END);
@@ -206 +212 @@
                         count ++;
                         if (count >= MAX_MATCHES){
-                            printf("// WARNING: too many matches for %s!\n", func_list[k].name);
+                            fprintf(out_fp,"// WARNING: too many matches for %s!\n", func_list[k].name);
                             break;
                         }
@@ -222 +228 @@
         // find best match and report results
         if (count == 0){
-            printf("// ERROR: %s is not found!\n", curr_name);
+            fprintf(out_fp,"// ERROR: %s is not found!\n", curr_name);
             ret = 1;
         } else {
@@ -230 +236 @@
 
             if (matches->fail > 0)
-                printf("// Best match: %d%%\n", matches->success*100/(matches->success+matches->fail));
-
-            printf("NSTUB(%s, 0x%x)\n", curr_name, matches->ptr);
+                fprintf(out_fp,"// Best match: %d%%\n", matches->success*100/(matches->success+matches->fail));
+
+            fprintf(out_fp,"NSTUB(%s, 0x%x)\n", curr_name, matches->ptr);
 
             for (i=1;i<count && matches[i].fail==matches[0].fail;i++){
-                printf("// ALT: NSTUB(%s, 0x%x) // %d/%d\n", curr_name, matches[i].ptr, matches[i].success, matches[i].fail);
+                fprintf(out_fp,"// ALT: NSTUB(%s, 0x%x) // %d/%d\n", curr_name, matches[i].ptr, matches[i].success, matches[i].fail);
             }
         }
@@ -242 +248 @@
     clock_t t2 = clock();
 
-    fprintf(stderr,"Time to generate stubs %.2f seconds\n",(double)(t2-t1)/(double)CLOCKS_PER_SEC);
+    printf("Time to generate stubs %.2f seconds\n",(double)(t2-t1)/(double)CLOCKS_PER_SEC);
+
+    fclose(out_fp);
 
     return ret;