Re: [avr-llvm-devel] New code commited

[John M. <ato...@gm...>]

On Tue, Oct 12, 2010 at 11:25 AM, Borja Ferrer <bor...@gm...>wrote:

> ...
>
> So now that the code is there (going to wait 2 more days until we merge it
> into trunk incase you find anything that has to be changed), i guess we
> should proceed in planning how to continue the work.
>
>
This is how I see the merge happening so far after comparing the branches.

 /AVR/TargetInfo/AVRTargetInfo.cpp   := ~same

/AVR/AsmPrinter/AVRAsmPrinter.cpp   := trunk has more AVR specific stuff

/AVR/AVR.td                         := ~same
/AVR/AVR.h                          := ~same

/faluco/AVR/AVR16bitInstPass.cpp    := mv to trunk

/AVR/AVRCallingConv.td              := use faluco
/AVR/AVRInstrFormats.td             := use faluco

/AVR/AVRInstrInfo.cpp|h             := use faluco, add any useful stuff from
trunk

/AVR/AVRInstrInfo.td                := use faluco, merge predicates from
trunk


/AVR/AVRISelDAGToDAG.cpp            := use faluco
/AVR/AVRISelLowering.cpp|h          := use faluco

/AVR/AVRMCAsmInfo.cpp|h             := merge
/AVR/AVRRegisterInfo.cpp|h          := merge

/AVR/AVRRegisterInfo.td             := use faluco

/AVR/AVRSelectionDAGInfo.cpp|h      := mv to trunk

/AVR/AVRSubtarget.cpp|h             := use trunk, merge for consistency

/AVR/AVRTargetMachine.cpp|h         := use faluco