Bug 73434 – MacroAssemblerSH4 does not implement readCallTarget

• Status: RESOLVED
• Resolution: FIXED
• Component: JavaScriptCore

[Csaba Osztrogonác]

It is blocker bug, beacuse after http://trac.webkit.org/changeset/101457
Qt-SH4 build is broken. (and all other MIPS build of course)

[Zoltan Herczeg]

Created attachment 117392 [details]
speculative patch

Could someone who has such machine try this fix first?

[thouraya]

Hi,

I'll try it today.

Regards,
Thouraya.

(In reply to comment #1)
> Created an attachment (id=117392) [details]
> speculative patch
> 
> Could someone who has such machine try this fix first?

[thouraya]

Hi, 

1509    static FunctionPtr readCallTarget(CodeLocationCall call)
>> CodeLocationCall  not defined in SH4Assembler.h
 1510    {
 1511        uint16_t* instructionPtr = call.dataLocation();
 1512        instructionPtr -= 3;
 1513        uint32_t addr = readPCrelativeAddress((*instructionPtr & 0xff), instructionPtr)
>> missed ;
 1514        return FunctionPtr(reinterpret_cast<void(*)()>(addr);
>> missed )
 1515    }


Regard,
Thouraya.

[Zoltan Herczeg]

Does it work (except the typos)?

[thouraya]

Yes it works.

(In reply to comment #4)
> Does it work (except the typos)?

[Csaba Osztrogonác]

Comment on attachment 117392 [details]
speculative patch

r=me with fixing typos mentioned in Comment #3

[Csaba Osztrogonác]

Comment on attachment 117392 [details]
speculative patch

Landed with typo fixes in http://trac.webkit.org/changeset/101801

[Csaba Osztrogonác]

Reopen, because build is still broken:

../../../../Source/JavaScriptCore/assembler/SH4Assembler.h:1509:39: error: 'CodeLocationCall' has not been declared../../../../Source/JavaScriptCore/assembler/SH4Assembler.h: In static member function 'static JSC::FunctionPtr JSC::SH4Assembler::readCallTarget(int)':
../../../../Source/JavaScriptCore/assembler/SH4Assembler.h:1511:41: error: request for member 'dataLocation' in 'call', which is of non-class type 'int'

It would be better if we make a similar change to ARM and MIPS:
- http://trac.webkit.org/changeset/101658
- http://trac.webkit.org/changeset/101473

[Zoltan Herczeg]

CodeLocationCall is an int???

[Eric Seidel (no email)]

Does not appear to have fixed things:
http://build.webkit.org/builders/Qt%20Linux%20SH4%20Release/builds/2703/steps/compile-webkit/logs/stdio

[Zoltan Herczeg]

../../../../Source/JavaScriptCore/jit/JITPropertyAccess.cpp: In static member function 'static bool JSC::JIT::isDirectPutById(JSC::StructureStubInfo*)':
../../../../Source/JavaScriptCore/jit/JITPropertyAccess.cpp:1160:25: error: 'readCallTarget' is not a member of 'JSC::MacroAssembler'

So I put it into a wrong file. We should move it to MacroAssemblerSH4.

[Zoltan Herczeg]

Created attachment 117853 [details]
another attempt

[Csaba Osztrogonác]

Comment on attachment 117853 [details]
another attempt

Let's see, r=me.

[Csaba Osztrogonác]

Comment on attachment 117853 [details]
another attempt

Clearing flags on attachment: 117853

Committed r101980: <http://trac.webkit.org/changeset/101980>

[Csaba Osztrogonác]

All reviewed patches have been landed.  Closing bug.