Changeset 150519 in webkit


Ignore:
Timestamp:
May 22, 2013, 9:42:29 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[sh4] Remove MacroAssemblerSH4.cpp file.
https://bugs.webkit.org/show_bug.cgi?id=116596.

Patch by Julien Brianceau <jbrianceau@nds.com> on 2013-05-22
Reviewed by Geoffrey Garen.

Move linkCall and repatchCall implementations from MacroAssemblerSH4.cpp
to MacroAssemblerSH4.h and remove MacroAssemblerSH4.cpp, as it is done
for other architectures.

  • GNUmakefile.list.am:
  • JavaScriptCore.xcodeproj/project.pbxproj:
  • Target.pri:
  • assembler/MacroAssemblerSH4.cpp: Removed.
  • assembler/MacroAssemblerSH4.h:

(JSC::MacroAssemblerSH4::linkCall):
(MacroAssemblerSH4):
(JSC::MacroAssemblerSH4::repatchCall):

Location:
trunk/Source/JavaScriptCore
Files:
1 deleted
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r150489 r150519  
     12013-05-22  Julien Brianceau  <jbrianceau@nds.com>
     2
     3        [sh4] Remove MacroAssemblerSH4.cpp file.
     4        https://bugs.webkit.org/show_bug.cgi?id=116596.
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        Move linkCall and repatchCall implementations from MacroAssemblerSH4.cpp
     9        to MacroAssemblerSH4.h and remove MacroAssemblerSH4.cpp, as it is done
     10        for other architectures.
     11
     12        * GNUmakefile.list.am:
     13        * JavaScriptCore.xcodeproj/project.pbxproj:
     14        * Target.pri:
     15        * assembler/MacroAssemblerSH4.cpp: Removed.
     16        * assembler/MacroAssemblerSH4.h:
     17        (JSC::MacroAssemblerSH4::linkCall):
     18        (MacroAssemblerSH4):
     19        (JSC::MacroAssemblerSH4::repatchCall):
     20
    1212013-05-21  Brent Fulgham  <bfulgham@apple.com>
    222
  • trunk/Source/JavaScriptCore/GNUmakefile.list.am

    r149911 r150519  
    7777        Source/JavaScriptCore/assembler/MacroAssemblerCodeRef.h \
    7878        Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h \
    79         Source/JavaScriptCore/assembler/MacroAssemblerSH4.cpp \
    8079        Source/JavaScriptCore/assembler/MacroAssemblerSH4.h \
    8180        Source/JavaScriptCore/assembler/MacroAssemblerX86.h \
  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r150148 r150519  
    565565                86ADD1450FDDEA980006EEC2 /* ARMv7Assembler.h in Headers */ = {isa = PBXBuildFile; fileRef = 86ADD1430FDDEA980006EEC2 /* ARMv7Assembler.h */; settings = {ATTRIBUTES = (Private, ); }; };
    566566                86ADD1460FDDEA980006EEC2 /* MacroAssemblerARMv7.h in Headers */ = {isa = PBXBuildFile; fileRef = 86ADD1440FDDEA980006EEC2 /* MacroAssemblerARMv7.h */; settings = {ATTRIBUTES = (Private, ); }; };
    567                 86AE64A8135E5E1C00963012 /* MacroAssemblerSH4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86AE64A5135E5E1C00963012 /* MacroAssemblerSH4.cpp */; };
    568567                86AE64A9135E5E1C00963012 /* MacroAssemblerSH4.h in Headers */ = {isa = PBXBuildFile; fileRef = 86AE64A6135E5E1C00963012 /* MacroAssemblerSH4.h */; settings = {ATTRIBUTES = (Private, ); }; };
    569568                86AE64AA135E5E1C00963012 /* SH4Assembler.h in Headers */ = {isa = PBXBuildFile; fileRef = 86AE64A7135E5E1C00963012 /* SH4Assembler.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    14681467                86ADD1430FDDEA980006EEC2 /* ARMv7Assembler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ARMv7Assembler.h; sourceTree = "<group>"; };
    14691468                86ADD1440FDDEA980006EEC2 /* MacroAssemblerARMv7.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacroAssemblerARMv7.h; sourceTree = "<group>"; };
    1470                 86AE64A5135E5E1C00963012 /* MacroAssemblerSH4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MacroAssemblerSH4.cpp; sourceTree = "<group>"; };
    14711469                86AE64A6135E5E1C00963012 /* MacroAssemblerSH4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MacroAssemblerSH4.h; sourceTree = "<group>"; };
    14721470                86AE64A7135E5E1C00963012 /* SH4Assembler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SH4Assembler.h; sourceTree = "<group>"; };
     
    28672865                                863B23DF0FC60E6200703AA4 /* MacroAssemblerCodeRef.h */,
    28682866                                86C568DE11A213EE0007F7F0 /* MacroAssemblerMIPS.h */,
    2869                                 86AE64A5135E5E1C00963012 /* MacroAssemblerSH4.cpp */,
    28702867                                86AE64A6135E5E1C00963012 /* MacroAssemblerSH4.h */,
    28712868                                860161E00F3A83C100F84710 /* MacroAssemblerX86.h */,
     
    39993996                                0FEB3ECF16237F6C00AB67AD /* MacroAssembler.cpp in Sources */,
    40003997                                86C568E011A213EE0007F7F0 /* MacroAssemblerARM.cpp in Sources */,
    4001                                 86AE64A8135E5E1C00963012 /* MacroAssemblerSH4.cpp in Sources */,
    40023998                                C2B916C514DA040C00CBAC86 /* MarkedAllocator.cpp in Sources */,
    40033999                                142D6F0813539A2800B02E86 /* MarkedBlock.cpp in Sources */,
  • trunk/Source/JavaScriptCore/Target.pri

    r149911 r150519  
    5252    assembler/MacroAssembler.cpp \
    5353    assembler/MacroAssemblerARM.cpp \
    54     assembler/MacroAssemblerSH4.cpp \
    5554    bytecode/ArrayAllocationProfile.cpp \
    5655    bytecode/ArrayProfile.cpp \
  • trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h

    r149676 r150519  
    22212221    friend class RepatchBuffer;
    22222222
    2223     static void linkCall(void*, Call, FunctionPtr);
    2224     static void repatchCall(CodeLocationCall, CodeLocationLabel);
    2225     static void repatchCall(CodeLocationCall, FunctionPtr);
     2223    static void linkCall(void* code, Call call, FunctionPtr function)
     2224    {
     2225        SH4Assembler::linkCall(code, call.m_label, function.value());
     2226    }
     2227
     2228    static void repatchCall(CodeLocationCall call, CodeLocationLabel destination)
     2229    {
     2230        SH4Assembler::relinkCall(call.dataLocation(), destination.executableAddress());
     2231    }
     2232
     2233    static void repatchCall(CodeLocationCall call, FunctionPtr destination)
     2234    {
     2235        SH4Assembler::relinkCall(call.dataLocation(), destination.executableAddress());
     2236    }
    22262237};
    22272238
Note: See TracChangeset for help on using the changeset viewer.