[llvm-commits] [llvm] r95034 - in /llvm/trunk/tools/ed: EDMain.cpp EnhancedDisassembly.exports EnhancedDisassembly.exports.blocks EnhancedDisassembly.exports.noblocks Makefile

[Evan Cheng]

Sean, please see Dan's comment to r94974. It's very bad to have a tool named 'ed' in the Unix world.

Evan

On Feb 1, 2010, at 4:04 PM, Sean Callanan wrote:

> Author: spyffe
> Date: Mon Feb  1 18:04:46 2010
> New Revision: 95034
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=95034&view=rev
> Log:
> Changed to Chris Lattner's suggested approach, which
> merely stubs out the blocks-based disassembly functions
> if the library wasn't built with blocks, which allows a
> constant .exports file and also properly deals with
> situations in which the compiler used to build a client
> is different from the compiler used to build the library.
> 
> Added:
>    llvm/trunk/tools/ed/EnhancedDisassembly.exports
> Removed:
>    llvm/trunk/tools/ed/EnhancedDisassembly.exports.blocks
>    llvm/trunk/tools/ed/EnhancedDisassembly.exports.noblocks
> Modified:
>    llvm/trunk/tools/ed/EDMain.cpp
>    llvm/trunk/tools/ed/Makefile
> 
> Modified: llvm/trunk/tools/ed/EDMain.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/ed/EDMain.cpp?rev=95034&r1=95033&r2=95034&view=diff
> 
> ==============================================================================
> --- llvm/trunk/tools/ed/EDMain.cpp (original)
> +++ llvm/trunk/tools/ed/EDMain.cpp Mon Feb  1 18:04:46 2010
> @@ -248,4 +248,18 @@
>   return inst->visitTokens(visitor);
> }
> 
> +#else
> +
> +extern "C" unsigned int EDBlockCreateInsts() {
> +  return 0;
> +}
> +
> +extern "C" int EDBlockEvaluateOperand() {
> +  return -1;
> +}
> +
> +extern "C" int EDBlockVisitTokens() {
> +  return -1;
> +}
> +
> #endif
> 
> Added: llvm/trunk/tools/ed/EnhancedDisassembly.exports
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/ed/EnhancedDisassembly.exports?rev=95034&view=auto
> 
> ==============================================================================
> --- llvm/trunk/tools/ed/EnhancedDisassembly.exports (added)
> +++ llvm/trunk/tools/ed/EnhancedDisassembly.exports Mon Feb  1 18:04:46 2010
> @@ -0,0 +1,31 @@
> +_EDGetDisassembler
> +_EDGetRegisterName
> +_EDRegisterIsStackPointer
> +_EDRegisterIsProgramCounter
> +_EDCreateInsts
> +_EDReleaseInst
> +_EDInstByteSize
> +_EDGetInstString
> +_EDInstIsBranch
> +_EDInstIsMove
> +_EDBranchTargetID
> +_EDMoveSourceID
> +_EDMoveTargetID
> +_EDNumTokens
> +_EDGetToken
> +_EDGetTokenString
> +_EDOperandIndexForToken
> +_EDTokenIsWhitespace
> +_EDTokenIsPunctuation
> +_EDTokenIsOpcode
> +_EDTokenIsLiteral
> +_EDTokenIsRegister
> +_EDTokenIsNegativeLiteral
> +_EDLiteralTokenAbsoluteValue
> +_EDRegisterTokenValue
> +_EDNumOperands
> +_EDGetOperand
> +_EDEvaluateOperand
> +_EDBlockCreateInsts
> +_EDBlockEvaluateOperand
> +_EDBlockVisitTokens
> 
> Removed: llvm/trunk/tools/ed/EnhancedDisassembly.exports.blocks
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/ed/EnhancedDisassembly.exports.blocks?rev=95033&view=auto
> 
> ==============================================================================
> --- llvm/trunk/tools/ed/EnhancedDisassembly.exports.blocks (original)
> +++ llvm/trunk/tools/ed/EnhancedDisassembly.exports.blocks (removed)
> @@ -1,31 +0,0 @@
> -_EDGetDisassembler
> -_EDGetRegisterName
> -_EDRegisterIsStackPointer
> -_EDRegisterIsProgramCounter
> -_EDCreateInsts
> -_EDReleaseInst
> -_EDInstByteSize
> -_EDGetInstString
> -_EDInstIsBranch
> -_EDInstIsMove
> -_EDBranchTargetID
> -_EDMoveSourceID
> -_EDMoveTargetID
> -_EDNumTokens
> -_EDGetToken
> -_EDGetTokenString
> -_EDOperandIndexForToken
> -_EDTokenIsWhitespace
> -_EDTokenIsPunctuation
> -_EDTokenIsOpcode
> -_EDTokenIsLiteral
> -_EDTokenIsRegister
> -_EDTokenIsNegativeLiteral
> -_EDLiteralTokenAbsoluteValue
> -_EDRegisterTokenValue
> -_EDNumOperands
> -_EDGetOperand
> -_EDEvaluateOperand
> -_EDBlockCreateInsts
> -_EDBlockEvaluateOperand
> -_EDBlockVisitTokens
> 
> Removed: llvm/trunk/tools/ed/EnhancedDisassembly.exports.noblocks
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/ed/EnhancedDisassembly.exports.noblocks?rev=95033&view=auto
> 
> ==============================================================================
> --- llvm/trunk/tools/ed/EnhancedDisassembly.exports.noblocks (original)
> +++ llvm/trunk/tools/ed/EnhancedDisassembly.exports.noblocks (removed)
> @@ -1,28 +0,0 @@
> -_EDGetDisassembler
> -_EDGetRegisterName
> -_EDRegisterIsStackPointer
> -_EDRegisterIsProgramCounter
> -_EDCreateInsts
> -_EDReleaseInst
> -_EDInstByteSize
> -_EDGetInstString
> -_EDInstIsBranch
> -_EDInstIsMove
> -_EDBranchTargetID
> -_EDMoveSourceID
> -_EDMoveTargetID
> -_EDNumTokens
> -_EDGetToken
> -_EDGetTokenString
> -_EDOperandIndexForToken
> -_EDTokenIsWhitespace
> -_EDTokenIsPunctuation
> -_EDTokenIsOpcode
> -_EDTokenIsLiteral
> -_EDTokenIsRegister
> -_EDTokenIsNegativeLiteral
> -_EDLiteralTokenAbsoluteValue
> -_EDRegisterTokenValue
> -_EDNumOperands
> -_EDGetOperand
> -_EDEvaluateOperand
> 
> Modified: llvm/trunk/tools/ed/Makefile
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/ed/Makefile?rev=95034&r1=95033&r2=95034&view=diff
> 
> ==============================================================================
> --- llvm/trunk/tools/ed/Makefile (original)
> +++ llvm/trunk/tools/ed/Makefile Mon Feb  1 18:04:46 2010
> @@ -10,7 +10,7 @@
> LEVEL = ../..
> LIBRARYNAME = EnhancedDisassembly
> 
> -BUILT_SOURCES = EDInfo.inc EnhancedDisassembly.exports
> +BUILT_SOURCES = EDInfo.inc
> 
> # Include this here so we can get the configuration of the targets
> # that have been configured for construction. We have to do this 
> @@ -34,7 +34,7 @@
>     # extra options to override libtool defaults 
>     LLVMLibsOptions    := $(LLVMLibsOptions)  \
>                          -avoid-version \
> -                         -Wl,-exported_symbols_list -Wl,EnhancedDisassembly.exports \
> +                         -Wl,-exported_symbols_list -Wl,$(PROJ_SRC_DIR)/EnhancedDisassembly.exports \
>                          -Wl,-dead_strip \
>                          -Wl,-seg1addr -Wl,0xE0000000 
> 
> @@ -51,17 +51,5 @@
> 	$(Echo) "Building semantic information header"
> 	$(Verb) $(TableGen) -o $(call SYSPATH, $@) -gen-enhanced-disassembly-header /dev/null
> 
> -EnhancedDisassembly.exports:	EnhancedDisassembly.exports.noblocks EnhancedDisassembly.exports.blocks
> -	$(Echo) "Copying exports file"
> -ifeq ($(HOST_OS),Darwin)
> -	$(Verb) if [ $(DARWIN_VERS) -ge 10 ] ; \
> -	  then $(CP) -f $(PROJ_SRC_DIR)/EnhancedDisassembly.exports.blocks EnhancedDisassembly.exports ; \
> -	  else $(CP) -f $(PROJ_SRC_DIR)/EnhancedDisassembly.exports.noblocks EnhancedDisassembly.exports ; \
> -	fi
> -else
> -	$(Verb) $(CP) -f $(PROJ_SRC_DIR)/EnhancedDisassembly.exports.noblocks EnhancedDisassembly.exports
> -endif
> -
> clean::
> 	-$(Verb) $(RM) -f EDInfo.inc
> -	-$(Verb) $(RM) -f EnhancedDisassembly.exports
> 
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits