From cdcd4b7deb3e925c7fe3c239ab4fac1e94efdf9c Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Tue, 9 May 2006 19:00:12 +0000 Subject: [PATCH] 2006-05-09 Dave Brolley * sid-cpu.scm (-gen-hw-stream-and-destream-fns): Use symbol->string instead of object->string om the mode. (-hw-gen-write-stack-decl): Likewise. --- ChangeLog | 3 +++ sid-cpu.scm | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f9358e6..f6e4e88 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,9 @@ * sim.scm (-gen-arch-model-decls): Likewise. * sid-cpu.scm (-gen-scache-semantic-fn): Generate code to set abuf->written if profiling. + (-gen-hw-stream-and-destream-fns): Use symbol->string instead of + object->string om the mode. + (-hw-gen-write-stack-decl): Likewise. * read.scm (include): Use arch-path as file location. (arch-path): Define it with a default setting. (-cgen): Update arch-path when "-a" option is specified. diff --git a/sid-cpu.scm b/sid-cpu.scm index ed53c0d..eb6f192 100644 --- a/sid-cpu.scm +++ b/sid-cpu.scm @@ -212,7 +212,7 @@ namespace @arch@ { (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)))) + (map (lambda (m) (sa (symbol->string m) "_memory")) useful-mode-names)))) (stream-reg (lambda (r) (let ((rname (sa "hardware." (gen-c-symbol (obj:name r))))) (if (hw-scalar? r) @@ -406,10 +406,10 @@ typedef struct { ; (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))))) + (mode-pad (spaces (- 4 (string-length (symbol->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"))) + " write_stack< write<" (symbol->string mode) "> >" mode-pad "\t" stack-name "\t[pipe_sz];\n"))) (define (-hw-gen-write-struct-decl) -- 2.43.5