Skip to content

[TRIAL] Implement the invokeinterface operation, And fix the invokedynamic operation #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
m3m0r7 merged 7 commits into from
May 6, 2019
Merged

[TRIAL] Implement the invokeinterface operation, And fix the invokedynamic operation #130

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f3c7c51
Add MethodType_info structure
m3m0r7 May 6, 2019
88b0aae
WIP
m3m0r7 May 6, 2019
a268383
Implement the invokeinterface operation, And fix the invokedynamic op…
m3m0r7 May 6, 2019
4489153
ignore unneeded attribution
m3m0r7 May 6, 2019
459fc78
Succeeded to run invokeinterface
m3m0r7 May 6, 2019
1b7e1df
Fix for coding rule
m3m0r7 May 6, 2019
1e640a4
Add invokeinterface test
m3m0r7 May 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
WIP
  • Loading branch information
@m3m0r7
m3m0r7 committed May 6, 2019
commit 88b0aae50ca6ab66a977bf18de5f52f5bfceab54
6 changes: 3 additions & 3 deletions src/Kernel/Mnemonics/_invokedynamic.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,14 @@ public function execute(): void
$methodHandleType = MethodType::methodType($className);

$result = forward_static_call_array(
[$factory, $name],
[$factory, $methodHandledName],
array_merge(
[
MethodHandles::lookup(),
$methodHandledName,
$name,
$methodHandleType,
$bootstrapMethodArguments[0]->getStringObject()
],
$bootstrapMethodArguments,
$arguments
)
);
Expand Down
2 changes: 1 addition & 1 deletion src/Kernel/Structures/_BootstrapMethod.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function execute(): void

$cp = $this->getConstantPool();
for ($i = 0; $i < $this->numBootstrapArguments; $i++) {
$this->bootstrapArguments[] = $cp[$cp[$this->readUnsignedShort()]->getStringIndex()];
$this->bootstrapArguments[] = $cp[$this->readUnsignedShort()];
}
}

Expand Down
1 change: 1 addition & 0 deletions src/Packages/java/lang/invoke/LambdaMetafactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public static function altMetafactory($a = null, $b = null, $c = null, $d = null
*/
public static function metafactory($a = null, $b = null, $c = null, $d = null, $e = null, $f = null)
{
var_dump(func_get_args());
throw new NotImplementedException(__METHOD__);
}
}