OSDN Git Service

(root) / pf3gnuchains / pf3gnuchains4x.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ffd1e89)
2001-07-11 Frank Ch. Eigler <fche@redhat.com>
authorbje <bje>
Sat, 4 Aug 2001 11:34:52 +0000 (11:34 +0000)
committerbje <bje>
Sat, 4 Aug 2001 11:34:52 +0000 (11:34 +0000)
* *.xml: Add <?xml ... ?> prefix.

2001-07-04  graydon hoare  <graydon@redhat.com>

* configure.in: Add maintainer-mode doc building configury.
* configure: Regenerate.
* Makefile.am: Add maintainer-mode doc building.
* Makefile.in: Regenerate.

2001-07-04  Ben Elliston  <bje@redhat.com>

* hw-memory-ram_rom-basic.txt: Generate.
* hw-memory-flash.txt: Likewise.
* hw-memory-flash-am29.txt: Remove.
* hw-memory-flash-at29.txt: Remove.
* Makefile.am (pkgdata_DATA): Incorporate aforementioned changes.
* Makefile.in: Regenerate.

2001-07-02  Ben Elliston  <bje@redhat.com>

* hw-memory-flash.xml: Document memory latency modelling.

2001-06-29  Ben Elliston  <bje@redhat.com>

* generic.cxx (stream_state): Include read-latency, write-latency.
(destream_state): Ditto.

* hw-memory-ram_rom-basic.xml: Merge in changes since 2001-06-01.

2001-06-27  graydon hoare  <graydon@redhat.com>

* hw-memory-flash.xml: Add.
* hw-memory-ram_rom-basic.xml: Add.

2001-03-23  John Healy  <jhealy@redhat.com>

* Makefile.in: Regenerated.

sid/component/memory/ChangeLog patch | blob | history
sid/component/memory/Makefile.am patch | blob | history
sid/component/memory/Makefile.in patch | blob | history
sid/component/memory/generic.cxx patch | blob | history

diff --git a/sid/component/memory/ChangeLog b/sid/component/memory/ChangeLog
index eccad78..6349d46 100644 (file)
--- a/sid/component/memory/ChangeLog
+++ b/sid/component/memory/ChangeLog
@@ -7,6 +7,42 @@
 
        * Makefile.am (check-local): Rename target from "checkme".
 
+2001-07-11  Frank Ch. Eigler  <fche@redhat.com>
+
+       * *.xml: Add <?xml ... ?> prefix.
+
+2001-07-04  graydon hoare  <graydon@redhat.com>
+
+       * configure.in: Add maintainer-mode doc building configury.
+       * configure: Regenerate.
+       * Makefile.am: Add maintainer-mode doc building.
+       * Makefile.in: Regenerate.
+
+2001-07-04  Ben Elliston  <bje@redhat.com>
+
+       * hw-memory-ram_rom-basic.txt: Generate.
+       * hw-memory-flash.txt: Likewise.
+       * hw-memory-flash-am29.txt: Remove.
+       * hw-memory-flash-at29.txt: Remove.
+       * Makefile.am (pkgdata_DATA): Incorporate aforementioned changes.
+       * Makefile.in: Regenerate.
+
+2001-07-02  Ben Elliston  <bje@redhat.com>
+
+       * hw-memory-flash.xml: Document memory latency modelling.
+
+2001-06-29  Ben Elliston  <bje@redhat.com>
+
+       * generic.cxx (stream_state): Include read-latency, write-latency.
+       (destream_state): Ditto.
+
+       * hw-memory-ram_rom-basic.xml: Merge in changes since 2001-06-01.
+
+2001-06-27  graydon hoare  <graydon@redhat.com>
+
+       * hw-memory-flash.xml: Add.
+       * hw-memory-ram_rom-basic.xml: Add.
+
 2001-06-22  Ben Elliston  <bje@redhat.com>
 
        * am29.cxx (am29_bus::write): Never return bus::delayed.
@@ -30,6 +66,10 @@
        * generic.cxx (image{load,store,mmap}_handler): Locate image-file
        using find_sid_data_file.
 
+2001-03-23  John Healy  <jhealy@redhat.com>
+
+       * Makefile.in: Regenerated.
+
 2001-03-16  Frank Ch. Eigler  <fche@redhat.com>
 
        * generic.cxx (imagemmap_handler): Enforce minimum mmap file size.
diff --git a/sid/component/memory/Makefile.am b/sid/component/memory/Makefile.am
index 362ae83..7b8c74c 100644 (file)
--- a/sid/component/memory/Makefile.am
+++ b/sid/component/memory/Makefile.am
@@ -10,8 +10,11 @@ libmemory_la_SOURCES = components.cxx generic.cxx ramrom.cxx flash.cxx \
                        at29.cxx am29.cxx
 libmemory_la_LDFLAGS = -module -no-undefined
 
-pkgdata_DATA = hw-memory-ram_rom-basic.txt hw-memory-flash-am29.txt hw-memory-flash-at29.txt
+pkgdata_DATA = hw-memory-ram_rom-basic.txt hw-memory-flash.txt
 
 DEJAGNUTESTS = am29.exp at29.exp at29xx.exp at29inv.exp at29val.exp genericmemory.exp memdocs.exp memmonkey.exp
 check-local: all
        (cd ../testsuite ; $(MAKE) check RUNTESTFLAGS="$(RUNTESTFLAGS) $(DEJAGNUTESTS)" )
+
+html_stylesheet=$(srcdir)/../component_html.xsl
+include $(srcdir)/../../config/Makefile.docs
diff --git a/sid/component/memory/Makefile.in b/sid/component/memory/Makefile.in
index 11e45bc..cc89708 100644 (file)
--- a/sid/component/memory/Makefile.in
+++ b/sid/component/memory/Makefile.in
@@ -11,6 +11,15 @@
 # PARTICULAR PURPOSE.
 
 
+# Makefile.docs -*- Makefile -*-
+# Copyright (C) 2001 Red Hat.
+# This file is part of SID and is licensed under the GPL.
+# See the file COPYING.SID for conditions for redistribution.
+#
+# ... to be included in document-building Makefile.am's
+#
+
+
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -69,6 +78,7 @@ DLLTOOL = @DLLTOOL@
 EXEEXT = @EXEEXT@
 LD = @LD@
 LIBTOOL = @LIBTOOL@
+LINKS = @LINKS@
 LN_S = @LN_S@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
@@ -76,7 +86,9 @@ NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+SABLOTRON = @SABLOTRON@
 VERSION = @VERSION@
+XSLTPROC = @XSLTPROC@
 lcd_libs = @lcd_libs@
 make_subdirs = @make_subdirs@
 sidtarget_arm = @sidtarget_arm@
@@ -97,9 +109,13 @@ libmemory_la_SOURCES = components.cxx generic.cxx ramrom.cxx flash.cxx \
 
 libmemory_la_LDFLAGS = -module -no-undefined
 
-pkgdata_DATA = hw-memory-ram_rom-basic.txt hw-memory-flash-am29.txt hw-memory-flash-at29.txt
+pkgdata_DATA = hw-memory-ram_rom-basic.txt hw-memory-flash.txt
 
 DEJAGNUTESTS = am29.exp at29.exp at29xx.exp at29inv.exp at29val.exp genericmemory.exp memdocs.exp memmonkey.exp
+
+html_stylesheet = $(srcdir)/../component_html.xsl
+
+SUFFIXES = .xml .txt .html
 mkinstalldirs = $(SHELL) $(top_srcdir)/../config/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -118,6 +134,11 @@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 DATA =  $(pkgdata_DATA)
 
 HEADERS =  $(noinst_HEADERS)
@@ -134,8 +155,8 @@ OBJECTS = $(libmemory_la_OBJECTS)
 
 all: all-redirect
 .SUFFIXES:
-.SUFFIXES: .S .c .cxx .lo .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+.SUFFIXES: .S .c .cxx .html .lo .o .s .txt .xml
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) $(srcdir)/../../config/Makefile.docs
        cd $(top_srcdir) && $(AUTOMAKE) --cygnus memory/Makefile
 
 Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
@@ -359,6 +380,16 @@ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 check-local: all
        (cd ../testsuite ; $(MAKE) check RUNTESTFLAGS="$(RUNTESTFLAGS) $(DEJAGNUTESTS)" )
 
+@MAINTAINER_MODE_TRUE@@HAVE_XSLTPROC_TRUE@.xml.html:
+@MAINTAINER_MODE_TRUE@@HAVE_XSLTPROC_TRUE@     xsltproc --output $@ $(html_stylesheet) $<
+
+@MAINTAINER_MODE_TRUE@@HAVE_XSLTPROC_FALSE@@HAVE_SABLOTRON_TRUE@.xml.html:
+@MAINTAINER_MODE_TRUE@@HAVE_XSLTPROC_FALSE@@HAVE_SABLOTRON_TRUE@       sabcmd $(html_stylesheet) $< $@
+
+@MAINTAINER_MODE_TRUE@@HAVE_LINKS_TRUE@.html.txt:
+@MAINTAINER_MODE_TRUE@@HAVE_LINKS_TRUE@        links -dump $< > $@
+@MAINTAINER_MODE_TRUE@@HAVE_LINKS_TRUE@        cp $@ $(srcdir)/$@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/sid/component/memory/generic.cxx b/sid/component/memory/generic.cxx
index eb5a9d3..3dbde6d 100644 (file)
--- a/sid/component/memory/generic.cxx
+++ b/sid/component/memory/generic.cxx
@@ -278,7 +278,10 @@ generic_memory::stream_state (ostream& out) const
   out << string2stream(this->image_file_name) << " "
       << this->imageload_pin << " "
       << this->imagestore_pin << endl;
-  
+
+  out << "read-latency " << read_latency;
+  out << "write-latency " << write_latency;
+
   if (this->buffer_length <= 4096) // encode small memories literally
     {
       out << "uncompressed "
@@ -359,6 +362,22 @@ generic_memory::destream_state (istream& in)
     }
   in >> stream2string(this->image_file_name) >> this->imageload_pin >> this->imagestore_pin;
 
+  in >> key;
+  if (key != "read-latency")
+    {
+      in.setstate (ios::badbit);
+      return;
+    }
+  in >> read_latency;
+
+  in >> key;
+  if (key != "write-latency")
+    {
+      in.setstate (ios::badbit);
+      return;
+    }
+  in >> write_latency;
+
   string coding;
   in >> coding;
   if (coding == "uncompressed")
4.x系GCCをフロントエンドとするgnu chains
About OSDN
Find Software
Develop Software
Help