From ea78fc91fca804d41e7caf94025a4616e4f2daad Mon Sep 17 00:00:00 2001 From: hachti Date: Mon, 26 Mar 2007 04:05:36 +0000 Subject: [PATCH] *** empty log message *** --- pc-tools/ldc2/Doxyfile | 2 +- pc-tools/ldc2/Makefile | 2 +- pc-tools/ldc2/data/test1.asm | 4 +++- pc-tools/ldc2/data/test1.obj | Bin 623 -> 663 bytes pc-tools/ldc2/doc/impl_spec.tex | 14 ++++++-------- pc-tools/ldc2/doc/literature.bib | 2 +- pc-tools/ldc2/doc/main.tex | 2 +- pc-tools/ldc2/src/configuration_manager.cpp | 14 +++++++++++--- 8 files changed, 24 insertions(+), 16 deletions(-) diff --git a/pc-tools/ldc2/Doxyfile b/pc-tools/ldc2/Doxyfile index 2581d0a..729040c 100644 --- a/pc-tools/ldc2/Doxyfile +++ b/pc-tools/ldc2/Doxyfile @@ -448,7 +448,7 @@ WARN_FORMAT = "WARNING $file:$line: $text" # and error messages should be written. If left blank the output is written # to stderr. -WARN_LOGFILE = doxy_warnings +WARN_LOGFILE = doxy/doxy_warnings #--------------------------------------------------------------------------- # configuration options related to the input files diff --git a/pc-tools/ldc2/Makefile b/pc-tools/ldc2/Makefile index 6776212..66ba7a9 100644 --- a/pc-tools/ldc2/Makefile +++ b/pc-tools/ldc2/Makefile @@ -4,7 +4,7 @@ CCFLAGS+=-Wall BUILD_STAMP="\"`uname -a`\"" -VERSION="\"0.7\"" +VERSION="\"1.0\"" BUILD_DATE="\"`date` \"" CCFLAGS+=-D BUILD_STAMP=$(BUILD_STAMP) -D VERSION=$(VERSION) -D BUILD_DATE=$(BUILD_DATE) diff --git a/pc-tools/ldc2/data/test1.asm b/pc-tools/ldc2/data/test1.asm index 76351a7..d10ed43 100644 --- a/pc-tools/ldc2/data/test1.asm +++ b/pc-tools/ldc2/data/test1.asm @@ -1,13 +1,15 @@ +* TEST ASSEMBLY PROGRAM SUBR SONNE,SUN SUBR BLUME,BLU SUBR ABCDEF,AFFE + ABS REL ORG '1000 ICA - ICA BLU LDA 0 SUN LDA 1 AFFE CRA + CALL HACHTI END \ No newline at end of file diff --git a/pc-tools/ldc2/data/test1.obj b/pc-tools/ldc2/data/test1.obj index b3e61423310b52996f8fc3e85423528d6dfc3310..35a47c21085e150569b94e6b74ca6f06750795e5 100644 GIT binary patch literal 663 zcmd6j-422<4291I5e%I(h6oo+d{Gi1c;TH!?(|`?h4S|XEX%TX=R55R>~VeiM%sGA zc~8F+U2Dq76;3XRB_C69pafkn!V(}L*C-#NQll91oPx5N{pePY2&d1SHV9@+JViIx zaNlOu32wkNGjCNZZV~JXpL=zeEp7#Wa7k4w9w9_4eEHaGX+CiEh=k{DXmVh)0BQ~S g)ZLE&+%ydJt`MrxdpjK-6n~so7;3a#KSaAb{`X2&4FCWD delta 118 zcmbQv`krONVI>g;1|9|m35Lo4C;e|^U}0d8VPN23;NfmyU}oZDU|^DHnyk+#Gnt1` zl9P#{fdQmq!sJ{=*~#9FlG4l|kroC90cN;%0ibpk1{s#g^^6L95+Du_ND%{%NXz6? GjAsFbSQhmF diff --git a/pc-tools/ldc2/doc/impl_spec.tex b/pc-tools/ldc2/doc/impl_spec.tex index 466e78b..fd98db2 100644 --- a/pc-tools/ldc2/doc/impl_spec.tex +++ b/pc-tools/ldc2/doc/impl_spec.tex @@ -11,7 +11,7 @@ most of the actual processing of the data after reading in is done by the routines contained in \verb|main.cpp|, \verb|config.cpp| and \verb|tool.cpp|. -Program configuration is capsuled into the class \verb|configuration_manager|, +Program configuration is encapsulated into the class \verb|configuration_manager|, used by the routines in \verb|config.cpp|. \subsubsection{Program flow} @@ -19,29 +19,27 @@ The \verb|main()| routine sets up the working environment using the \verb|do_con subroutine contained in \verb|config.cpp|. This contains parsing the command line, reading a configuration file, and setting the global \verb|cfg_*| flags. The input and output file descriptors \verb|in_fd| and \verb|out_fd| are assigned to 0 and 1 respective -files as stated in the configuration (command line option or configuration file). -The \verb|configuration_manager| is able to dynamically generate help output for all -options. +open files as determined by the configuration (command line option or configuration file).\\ The next call is \verb|read_tape()|, the data input routine. In \verb|read_tape()|, the static factory method \verb|tape_block::gen_from_fd()| is used to create and check blocks, taking data directly from the global file descriptor \verb|in_fd|.\\ At the end of \verb|read_tape()|, the vector \verb|tape| has been filled with -pointers to instances of \verb|tape_block|. +pointers to instances of \verb|tape_block|.\\ In the next step, the routine \verb|process_tape()| is called, in which integrity checks on object level and splitting to files (if desired) are accomplished. Every valid and complete object consist of either one single \verb|eot_block| or a series of \verb|data_block|s, while the last block -of each object must be one of the types which mark the end of an object. +of each object must be one of the types which mark the end of an object.\\ After all that, \verb|process_symbols()| is called. This routine generates three vectors containing symbol names: \verb|exported|, \verb|called|, and \verb|unsatisfied|. The latter is the difference of \verb|called| and \verb|exported|.\\ If desired, those vectors are written out to \verb|out_fd|, one symbol per line. -\subsubsection{Block factory} -The software makes use of C++ virtual methods allowing for convinient processing of +\subsubsection{Block factory} +The software makes use of C++ virtual methods allowing for convenient processing of multiple kinds of blocks without knowing much about the block type currently worked on.\\ The block factory consists of the static factory method \verb|tape_block::gen_from_fd()| diff --git a/pc-tools/ldc2/doc/literature.bib b/pc-tools/ldc2/doc/literature.bib index 9d2ff90..4ef11de 100644 --- a/pc-tools/ldc2/doc/literature.bib +++ b/pc-tools/ldc2/doc/literature.bib @@ -10,7 +10,7 @@ @string{hon_organization="Honeywell"} @string{hdoc="Doc. No."} -string{hon_author=""} +@string{hon_author=""} @InBook{ser16:progref:bformats, title = "Object Program Format", diff --git a/pc-tools/ldc2/doc/main.tex b/pc-tools/ldc2/doc/main.tex index c6adc82..60097ea 100644 --- a/pc-tools/ldc2/doc/main.tex +++ b/pc-tools/ldc2/doc/main.tex @@ -13,7 +13,7 @@ \pagestyle{empty} \pagenumbering{roman} -%\input cover +\input cover \newpage \pagestyle{plain} diff --git a/pc-tools/ldc2/src/configuration_manager.cpp b/pc-tools/ldc2/src/configuration_manager.cpp index 74d2f19..ea95bf8 100644 --- a/pc-tools/ldc2/src/configuration_manager.cpp +++ b/pc-tools/ldc2/src/configuration_manager.cpp @@ -2,11 +2,14 @@ * * LDC2 source code * - * $Date: 2007/03/26 01:00:38 $ + * $Date: 2007/03/26 04:05:37 $ * $Author: hachti $ * * $Log: configuration_manager.cpp,v $ - * Revision 2.0 2007/03/26 01:00:38 hachti + * Revision 2.1 2007/03/26 04:05:37 hachti + * *** empty log message *** + * + * Revision 2.0 2007-03-26 01:00:38 hachti * *** empty log message *** * * @@ -42,6 +45,11 @@ configuration_manager::configuration_manager(string name){ *\param target Pointer to string to put the value in. *\param placeholder A placeholder for the documentation. * For example in -f + *\param allow_cmdline Specifies if this value may be specified on the + * command line. + *\param allow_conffile Specifies if this value may be specified in a + * configuration file. + * */ void configuration_manager::add_option_value (const string & shortname, const string & longname, @@ -129,7 +137,7 @@ void configuration_manager::add_argument(const string & description, /*! - *\Read in the args passed to main(). + *\brief Read in the args passed to main(). *\returns empty vector on success or the error messages to be output. */ vector configuration_manager::read_args(int argc, char ** args){ -- 2.32.0