Deleting a file I missed

Cleaner make clean

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 12546]

2 files changed, 78 insertions, 111 deletions

diff --git a/cuobjdump_to_ptxplus/Makefile b/cuobjdump_to_ptxplus/Makefile
index 7f58f69..e2f9da5 100644
--- a/cuobjdump_to_ptxplus/Makefile
+++ b/cuobjdump_to_ptxplus/Makefile
@@ -69,21 +69,13 @@ depend:
 	makedepend $(SRCS) 2> /dev/null
 
 clean:
-	rm -f ./opcodes.def ./opcodes.h
-	rm -f ./lex.ptx_.c ./ptx.tab.c ./ptx.tab.h ./lex.ptx_.o ./ptx.tab.o ptx.output
-	rm -f ./headerParser.o ./headerLexer.o ./headerParser.cpp ./headerParser.hpp ./headerLexer.cpp ./headerParser.output
-	rm -f ./header_parser.output ./header_parser.o header_parser.cc header_parser.hh header_lexer.cc header_lexer.hh
-	rm -f ./stringList.o
-	rm -f ./cuobjdumpInstList.o ./cuobjdumpInst.o
-	rm -f ./sass_lexer.o ./sass_parser.o ./cuobjdump_to_ptxplus.o
-	rm -f ./sass_parser.hpp ./sass_parser.output ./sass_parser.h
-	rm -f ./sass_parser.cpp ./sass_lexer.cpp
-	rm -f ./cuobjdump_to_ptxplus
-	rm -f ./cuobjdump_parser.o ./cuobjdump_parser.c ./cuobjdump_parser.output ./cuobjdump_parser.h
-	rm -f ./cuobjdump_lexer.o ./cuobjdump_lexer.c
-	rm -f ./elf_lexer.o ./elf_parser.o ./elf_lexer.cpp ./elf_parser.cpp ./elf_parser.hpp ./elf_parser.output
-	rm -f ./header_lexer.o header_lexer.c header_lexer.h sass_lexer.c sass_lexer.h sass_parser.c
-	rm -f ./sass_lexer.cc ./sass_parser.cc ./sass_parser.hh ./sass_lexer.hh
+	rm -f opcodes.def opcodes.h
+	rm -f lex.ptx_.c ptx.tab.c ptx.tab.h lex.ptx_.o ptx.tab.o ptx.output
+	rm -f elf_lexer.cc  elf_parser.cc  elf_parser.hh
+	rm -f sass_lexer.cc  sass_parser.cc  sass_parser.hh  sass_parser.output
+	rm -f header_lexer.cc  header_parser.cc  header_parser.hh  header_parser.output
+	rm -f *.o
+	rm -f cuobjdump_to_ptxplus
 # DO NOT DELETE
 
 cuobjdumpInst.o: cuobjdumpInst.h /usr/include/string.h
@@ -171,6 +163,77 @@ elf_parser.o: /usr/include/sys/select.h /usr/include/bits/select.h
 elf_parser.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
 elf_parser.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
 elf_parser.o: /usr/include/alloca.h stringList.h
+header_lexer.o: /usr/include/stdio.h /usr/include/features.h
+header_lexer.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+header_lexer.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+header_lexer.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+header_lexer.o: /usr/include/libio.h /usr/include/_G_config.h
+header_lexer.o: /usr/include/wchar.h /usr/include/bits/stdio_lim.h
+header_lexer.o: /usr/include/bits/sys_errlist.h /usr/include/string.h
+header_lexer.o: /usr/include/xlocale.h /usr/include/errno.h
+header_lexer.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
+header_lexer.o: /usr/include/asm/errno.h /usr/include/asm-generic/errno.h
+header_lexer.o: /usr/include/asm-generic/errno-base.h /usr/include/stdlib.h
+header_lexer.o: /usr/include/sys/types.h /usr/include/time.h
+header_lexer.o: /usr/include/endian.h /usr/include/bits/endian.h
+header_lexer.o: /usr/include/bits/byteswap.h /usr/include/sys/select.h
+header_lexer.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+header_lexer.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
+header_lexer.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h
+header_lexer.o: header_parser.hh /usr/include/unistd.h
+header_lexer.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h
+header_lexer.o: /usr/include/getopt.h
+header_parser.o: cuobjdumpInstList.h cuobjdumpInst.h /usr/include/string.h
+header_parser.o: /usr/include/features.h /usr/include/sys/cdefs.h
+header_parser.o: /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h
+header_parser.o: /usr/include/gnu/stubs-64.h /usr/include/xlocale.h
+header_parser.o: /usr/include/stdio.h /usr/include/bits/types.h
+header_parser.o: /usr/include/bits/typesizes.h /usr/include/libio.h
+header_parser.o: /usr/include/_G_config.h /usr/include/wchar.h
+header_parser.o: /usr/include/bits/stdio_lim.h
+header_parser.o: /usr/include/bits/sys_errlist.h /usr/include/stdlib.h
+header_parser.o: /usr/include/sys/types.h /usr/include/time.h
+header_parser.o: /usr/include/endian.h /usr/include/bits/endian.h
+header_parser.o: /usr/include/bits/byteswap.h /usr/include/sys/select.h
+header_parser.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+header_parser.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
+header_parser.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h
+header_parser.o: stringList.h
+sass_lexer.o: /usr/include/stdio.h /usr/include/features.h
+sass_lexer.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+sass_lexer.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+sass_lexer.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+sass_lexer.o: /usr/include/libio.h /usr/include/_G_config.h
+sass_lexer.o: /usr/include/wchar.h /usr/include/bits/stdio_lim.h
+sass_lexer.o: /usr/include/bits/sys_errlist.h /usr/include/string.h
+sass_lexer.o: /usr/include/xlocale.h /usr/include/errno.h
+sass_lexer.o: /usr/include/bits/errno.h /usr/include/linux/errno.h
+sass_lexer.o: /usr/include/asm/errno.h /usr/include/asm-generic/errno.h
+sass_lexer.o: /usr/include/asm-generic/errno-base.h /usr/include/stdlib.h
+sass_lexer.o: /usr/include/sys/types.h /usr/include/time.h
+sass_lexer.o: /usr/include/endian.h /usr/include/bits/endian.h
+sass_lexer.o: /usr/include/bits/byteswap.h /usr/include/sys/select.h
+sass_lexer.o: /usr/include/bits/select.h /usr/include/bits/sigset.h
+sass_lexer.o: /usr/include/bits/time.h /usr/include/sys/sysmacros.h
+sass_lexer.o: /usr/include/bits/pthreadtypes.h /usr/include/alloca.h
+sass_lexer.o: sass_parser.hh /usr/include/unistd.h
+sass_lexer.o: /usr/include/bits/posix_opt.h /usr/include/bits/confname.h
+sass_lexer.o: /usr/include/getopt.h
+sass_parser.o: /usr/include/stdio.h /usr/include/features.h
+sass_parser.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
+sass_parser.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
+sass_parser.o: /usr/include/bits/types.h /usr/include/bits/typesizes.h
+sass_parser.o: /usr/include/libio.h /usr/include/_G_config.h
+sass_parser.o: /usr/include/wchar.h /usr/include/bits/stdio_lim.h
+sass_parser.o: /usr/include/bits/sys_errlist.h cuobjdumpInstList.h
+sass_parser.o: cuobjdumpInst.h /usr/include/string.h /usr/include/xlocale.h
+sass_parser.o: /usr/include/stdlib.h /usr/include/sys/types.h
+sass_parser.o: /usr/include/time.h /usr/include/endian.h
+sass_parser.o: /usr/include/bits/endian.h /usr/include/bits/byteswap.h
+sass_parser.o: /usr/include/sys/select.h /usr/include/bits/select.h
+sass_parser.o: /usr/include/bits/sigset.h /usr/include/bits/time.h
+sass_parser.o: /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h
+sass_parser.o: /usr/include/alloca.h stringList.h
 stringList.o: stringList.h /usr/include/stdio.h /usr/include/features.h
 stringList.o: /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h
 stringList.o: /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h
diff --git a/decuda_to_ptxplus/decudaInst.h b/decuda_to_ptxplus/decudaInst.h
deleted file mode 100644
index 491fe3c..0000000
--- a/decuda_to_ptxplus/decudaInst.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright (c) 2009-2011, Jimmy Kwa,
-// The University of British Columbia
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// Redistributions of source code must retain the above copyright notice, this
-// list of conditions and the following disclaimer.
-// Redistributions in binary form must reproduce the above copyright notice, this
-// list of conditions and the following disclaimer in the documentation and/or
-// other materials provided with the distribution.
-// Neither the name of The University of British Columbia nor the names of its
-// contributors may be used to endorse or promote products derived from this
-// software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#ifndef _DECUDAINST_H_
-#define _DECUDAINST_H_
-#include "stringList.h"
-#include <assert.h>
-
-class decudaInst
-{
-
-protected:
-	//instruction data
-	const char* m_label; //instruction label
-	stringList* m_predicate; //instruction predicate
-	const char* m_base; //instruction mnemonic
-	stringList* m_baseModifiers; //base modifiers
-	stringList* m_typeModifiers; //operand types
-	stringList* m_operands; //operands
-	stringList* m_predicateModifiers; //predicate modifiers
-	
-
-	int m_opPerCycle; // stores operations per cycle count for current instruction
-
-	//next instruction in linked list
-	//direction is m_listStart to m_listEnd
-	decudaInst* m_nextDecudaInst;
-
-	// print instruction unmodified
-	void printDefaultPtx();
-	void printBaseModifiers();
-	void printTypeModifiers();
-	void printOperands();
-	void printLabel();
-	void printPredicate();
-
-public:
-	//constructor
-	decudaInst();
-
-	//accessors
-	const char* getBase();
-	stringList* getOperands();
-	stringList* getBaseModifiers();
-        stringList* getTypeModifiers();
-	decudaInst* getNextDecudaInst();
-
-   int getOpPerCycle() const { return m_opPerCycle; }
-
-	bool isEntryStart();	// true if start of an entry
-
-	//mutators
-	void setBase(const char* setBaseValue);
-	void addBaseModifier(const char* addBaseMod);
-	void addTypeModifier(const char* addTypeMod);
-	void addOperand(const char* addOp);
-	void setPredicate(const char* setPredicateValue);
-	void addPredicateModifier(const char* addPredicateMod);
-	void setLabel(const char* setLabelValue);
-
-	void setNextDecudaInst(decudaInst* setDecudaInstValue);
-
-	//print representation
-	bool printHeaderInst();
-	bool printHeaderInst2();
-	void printDecudaInst();
-	void printNewPtx();
-	void printHeaderPtx();
-	//TODO: translate to New PTX and print
-
-};
-#endif //_DECUDAINST_H_