Skip to content
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.

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

Additional Math functions #620

Merged
merged 29 commits into from Apr 1, 2019
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

Merge branch 'master' of https://github.com/mosa/MOSA-Project

# Conflicts:
#	Source/Mosa.Platform.x64/CompilerStages/MultibootV1Stage.cs
#	Source/Mosa.Platform.x86/CompilerStages/MultibootV1Stage.cs
  • Loading branch information...
tgiphil committed Mar 23, 2019
commit 220fea7c617784fa4429b1296775979ab6a279bb
@@ -31,7 +31,7 @@ protected override void CreateMultibootMethod()
basicBlocks.AddHeadBlock(block);
var ctx = new Context(block);

ctx.AppendInstruction(X64.Sti);
ctx.AppendInstruction(X64.Cli);

// Setup the stack and place the sentinel on the stack to indicate the start of the stack
ctx.AppendInstruction(X64.Mov64, esp, stackTop);
@@ -43,7 +43,7 @@ protected override void CreateMultibootMethod()
ctx.AppendInstruction(X64.MovStore64, null, multibootEAX, zero, eax);
ctx.AppendInstruction(X64.MovStore64, null, multibootEBX, zero, ebx);

ctx.AppendInstruction(X64.Cli);
ctx.AppendInstruction(X64.Sti);
ctx.AppendInstruction(X64.Call, null, entryPoint);
ctx.AppendInstruction(X64.Ret);

@@ -31,7 +31,7 @@ protected override void CreateMultibootMethod()
basicBlocks.AddHeadBlock(block);
var ctx = new Context(block);

ctx.AppendInstruction(X86.Sti);
ctx.AppendInstruction(X86.Cli);

// Setup the stack and place the sentinel on the stack to indicate the start of the stack
ctx.AppendInstruction(X86.Mov32, esp, stackTop);
@@ -43,7 +43,7 @@ protected override void CreateMultibootMethod()
ctx.AppendInstruction(X86.MovStore32, null, multibootEAX, zero, eax);
ctx.AppendInstruction(X86.MovStore32, null, multibootEBX, zero, ebx);

ctx.AppendInstruction(X86.Cli);
ctx.AppendInstruction(X86.Sti);
ctx.AppendInstruction(X86.Call, null, entryPoint);
ctx.AppendInstruction(X86.Ret);

You are viewing a condensed version of this merge commit. You can view the full changes here.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.