From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3814 invoked by alias); 15 Dec 2005 16:30:36 -0000 Received: (qmail 3780 invoked by uid 22791); 15 Dec 2005 16:30:31 -0000 X-Spam-Check-By: sourceware.org Received: from voldemort.codesourcery.com (HELO mail.codesourcery.com) (65.74.133.5) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 15 Dec 2005 16:30:30 +0000 Received: (qmail 10970 invoked from network); 15 Dec 2005 16:30:27 -0000 Received: from unknown (HELO ?192.168.189.167?) (nathan@127.0.0.2) by mail.codesourcery.com with ESMTPA; 15 Dec 2005 16:30:27 -0000 Message-ID: <43A19A1A.1070808@codesourcery.com> Date: Thu, 15 Dec 2005 16:30:00 -0000 From: Nathan Sidwell User-Agent: Mozilla Thunderbird 1.0.7 (X11/20051013) MIME-Version: 1.0 To: cgen@sources.redhat.com, "Frank Ch. Eigler" Subject: fix type mismatch Content-Type: multipart/mixed; boundary="------------070905090002000408030104" Mailing-List: contact cgen-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cgen-owner@sourceware.org X-SW-Source: 2005-q4/txt/msg00052.txt.bz2 This is a multi-part message in MIME format. --------------070905090002000408030104 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 430 In renaming the ms1 port, I had a problem rebuilding the autogenerated source files. string-append and string-length complained about being given a symbol. I'm using guile 1.6.7. This patch fixes the three places it was necessary to stringize a 'mode'. ok? nathan -- Nathan Sidwell :: http://www.codesourcery.com :: CodeSourcery LLC nathan@codesourcery.com :: http://www.planetfall.pwp.blueyonder.co.uk --------------070905090002000408030104 Content-Type: text/plain; name="all.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="all.diff" Content-length: 2045 2005-12-15 Nathan Sidwell * sid-cpu.scm (-gen-hw-stream-and-destream-fns): Stringize mode for concatenation. (-hw-gen-write-stack-decl): Likewise. Index: sid-cpu.scm =================================================================== RCS file: /cvs/src/src/cgen/sid-cpu.scm,v retrieving revision 1.14 diff -c -3 -p -r1.14 sid-cpu.scm *** sid-cpu.scm 28 Oct 2005 19:30:02 -0000 1.14 --- sid-cpu.scm 15 Dec 2005 16:22:09 -0000 *************** namespace @arch@ { *** 212,218 **** (write-stacks (map (lambda (n) (sa n "_writes")) (append (map (lambda (r) (gen-c-symbol (obj:name r))) regs) ! (map (lambda (m) (sa m "_memory")) useful-mode-names)))) (stream-reg (lambda (r) (let ((rname (sa "hardware." (gen-c-symbol (obj:name r))))) (if (hw-scalar? r) --- 212,218 ---- (write-stacks (map (lambda (n) (sa n "_writes")) (append (map (lambda (r) (gen-c-symbol (obj:name r))) regs) ! (map (lambda (m) (sa (object->string m) "_memory")) useful-mode-names)))) (stream-reg (lambda (r) (let ((rname (sa "hardware." (gen-c-symbol (obj:name r))))) (if (hw-scalar? r) *************** typedef struct { *** 406,415 **** ; (pipe-sz (+ 1 (max-delay (cpu-max-delay (current-cpu))))) ; (sz (* pipe-sz (-worst-case-number-of-writes-to nm)))) ! (mode-pad (spaces (- 4 (string-length mode)))) (stack-name (string-append nm "_writes"))) (string-append ! " write_stack< write<" mode "> >" mode-pad "\t" stack-name "\t[pipe_sz];\n"))) (define (-hw-gen-write-struct-decl) --- 406,415 ---- ; (pipe-sz (+ 1 (max-delay (cpu-max-delay (current-cpu))))) ; (sz (* pipe-sz (-worst-case-number-of-writes-to nm)))) ! (mode-pad (spaces (- 4 (string-length (object->string mode))))) (stack-name (string-append nm "_writes"))) (string-append ! " write_stack< write<" (object->string mode) "> >" mode-pad "\t" stack-name "\t[pipe_sz];\n"))) (define (-hw-gen-write-struct-decl) --------------070905090002000408030104--