[Simulavr-devel] simulavr-vcd manual page and miscelania [PATCH]

[Shaun Jackman]

Hello,

Here's a small patch for you, including a manual page for
simulavr-vcd. I found the inline changes necessary to make it compile.

Cheers,
Shaun


2004-04-10  Shaun Jackman  <address@hidden>

        * simulavr-vcd.1: New.
        * avrcore.c (brk_pt_new, irq_new): Move inline definition above use.
        * vcd.h (vcd_set_clock): Remove inline.
        * test_8515/Makefile.am (CLEANFILES): Add $(TEST_PRG) and fix typo.


--- simulavr-0.1.2.1.orig/debian/simulavr-vcd.1
+++ simulavr-0.1.2.1/debian/simulavr-vcd.1
@@ -0,0 +1,31 @@
+.TH SIMULAVR-VCD 1 2004-04-10 "simulavr 0.1.2.1" "User Commands"
+.SH NAME
+simulavr-vcd \- simulate an Atmel AVR and output VCD (value change dump)
+.SH SYNOPSIS
+.B simulavr-vcd
+[\fB-p\fR|--\fBpfd\fR=\fIFD\fR] FLASH_SIZE SRAM_SIZE SRAM_START EEPROM_SIZE
+.SH DESCRIPTION
+Writes the output of simulavr from the pipe FD to a VCD (value change
+dump) file.
+.SS Options
+.TP
+\fB\-p\fR, \fB\-\-pfd\fR=\fIFD\fR
+file descriptor number of the pipe to which simulavr is writing its
+output
+.SH AUTHOR
+Written by Carsten Beth and Theodore A. Roth.
+
+This manual page was written by Shaun Jackman <address@hidden>
+for the Debian system.
+.SH "REPORTING BUGS"
+Report bugs to <address@hidden>
+.SH COPYRIGHT
+Copyright 2002 Carsten Beth, Theodore A. Roth
+
+simulavr-vcd is free software, covered by the GNU General Public License,
+and you are welcome to change it and/or distribute copies of it under
+the conditions of the GNU General Public License.
+.SH "SEE ALSO"
+\fBsimulavr\fR(1), \fBsimulavr-disp\fR(1)
+
+http://savannah.nongnu.org/projects/simulavr/
--- simulavr-0.1.2.1.orig/src/avrcore.c
+++ simulavr-0.1.2.1/src/avrcore.c
@@ -84,18 +84,6 @@
 static inline void brk_pt_construct (BreakPt *bp, int pc, uint16_t opcode);
 static inline void brk_pt_destroy (void *bp);
 
-static inline BreakPt *
-brk_pt_new (int pc, uint16_t opcode)
-{
-    BreakPt *bp;
-
-    bp = avr_new (BreakPt, 1);
-    brk_pt_construct (bp, pc, opcode);
-    class_overload_destroy ((AvrClass *)bp, brk_pt_destroy);
-
-    return bp;
-}
-
 static inline void
 brk_pt_construct (BreakPt *bp, int pc, uint16_t opcode)
 {
@@ -108,6 +96,18 @@
     bp->opcode = opcode;
 }
 
+static inline BreakPt *
+brk_pt_new (int pc, uint16_t opcode)
+{
+    BreakPt *bp;
+
+    bp = avr_new (BreakPt, 1);
+    brk_pt_construct (bp, pc, opcode);
+    class_overload_destroy ((AvrClass *)bp, brk_pt_destroy);
+
+    return bp;
+}
+
 static inline void
 brk_pt_destroy (void *bp)
 {
@@ -197,18 +197,6 @@
                                   unsigned int sleep_mode);
 static inline void irq_destroy (void *irq);
 
-static inline Irq *
-irq_new (IntVect *vector, int state, unsigned int sleep_mode)
-{
-    Irq *irq;
-
-    irq = avr_new (Irq, 1);
-    irq_construct (irq, vector, state, sleep_mode);
-    class_overload_destroy ((AvrClass *)irq, irq_destroy);
-
-    return irq;
-}
-
 static inline void
 irq_construct (Irq *irq, IntVect *vector, int state, unsigned int sleep_mode)
 {
@@ -222,6 +210,18 @@
     irq->sleep_mode = sleep_mode;
 }
 
+static inline Irq *
+irq_new (IntVect *vector, int state, unsigned int sleep_mode)
+{
+    Irq *irq;
+
+    irq = avr_new (Irq, 1);
+    irq_construct (irq, vector, state, sleep_mode);
+    class_overload_destroy ((AvrClass *)irq, irq_destroy);
+
+    return irq;
+}
+
 static inline void
 irq_destroy (void *irq)
 {
--- simulavr-0.1.2.1.orig/src/disp-vcd/vcd.h
+++ simulavr-0.1.2.1/src/disp-vcd/vcd.h
@@ -47,7 +47,7 @@
 /* Interface for disp.c */
 int vcd_write_header( void );
 
-inline int vcd_set_clock( unsigned int c );
+int vcd_set_clock( unsigned int c );
 int vcd_write_clock( void );
 
 int vcd_bind_io_reg_shortcut( char *io_reg_name, int io_reg_addr );
--- simulavr-0.1.2.1.orig/test_asm/test_8515/Makefile.am
+++ simulavr-0.1.2.1/test_asm/test_8515/Makefile.am
@@ -23,7 +23,7 @@
 ## handle these in a sane way.
 
 MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES           = *.elf *.lst *.bin *.hex
+CLEANFILES           = *.elf *.lst *.bin *.hex $(TEST_PRG)
 
 TEST_ASM_SRC         = \
        test_blink.asm \
@@ -59,7 +59,7 @@
 
 include $(top_srcdir)/Makefile_AVR_Rules
 
-## This is how I download to the stk200 using usip:
+## This is how I download to the stk200 using uisp:
 #download: dl.hex
 #      uisp -dprog=stk200 -dlpt=/dev/parport0 --erase
 #      uisp -dprog=stk200 -dlpt=/dev/parport0 --upload if=dl.hex