dan/Cosmos
1
0
Fork 0
mirror of https://github.com/danbulant/Cosmos synced 2026-06-10 10:11:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
kudzu_cp 2014-07-12 18:47:29 +00:00
parent c3030c2726
commit 609aebe90b
5 changed files with 33 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Setup2/Cosmos.iss
View file

@ -325,7 +325,7 @@ Root: HKLM; SubKey: Software\Microsoft\VisualStudio\12.0\Generators\{{FAE04EC1-3
; X# file generator type
Root: HKLM; SubKey: Software\Microsoft\VisualStudio\12.0\CLSID\{{D6F57DE8-E50E-4C91-99E1-FA2E262BC4EA}; ValueType: none; Flags: uninsdeletekey
Root: HKLM; SubKey: Software\Microsoft\VisualStudio\12.0\CLSID\{{D6F57DE8-E50E-4C91-99E1-FA2E262BC4EA}; ValueType: string; ValueName: Assembly; ValueData: Cosmos.VS.XSharp
Root: HKLM; SubKey: Software\Microsoft\VisualStudio\12.0\CLSID\{{D6F57DE8-E50E-4C91-99E1-FA2E262BC4EA}; ValueType: string; ValueName: Class; ValueData: Cosmos.VS.XSharp.FileGenerator
Root: HKLM; SubKey: Software\Microsoft\VisualStudio\12.0\CLSID\{{D6F57DE8-E50E-4C91-99E1-FA2E262BC4EA}; ValueType: string; ValueName: Class; ValueData: Cosmos.VS.XSharp.XsToAsmFileGenerator
Root: HKLM; SubKey: Software\Microsoft\VisualStudio\12.0\CLSID\{{D6F57DE8-E50E-4C91-99E1-FA2E262BC4EA}; ValueType: string; ValueName: InprocServer32; ValueData: {sys}\mscoree.dll
Root: HKLM; SubKey: Software\Microsoft\VisualStudio\12.0\CLSID\{{D6F57DE8-E50E-4C91-99E1-FA2E262BC4EA}; ValueType: string; ValueName: CodeBase; ValueData: {app}\build\vsip\Cosmos.VS.XSharp.dll

2
source/XSharp Projects.txt
View file

@ -9,6 +9,8 @@ Compiler for XSharp
-----------------------------------------------------------------------------
Cosmos.VS.XSharp
Library - VS Language Service
Rebuild - Rerun install.bat
VS extension for support for X#.
-----------------------------------------------------------------------------

1
source2/Compiler/Cosmos.Compiler.DebugStub/AsmBreak.asm
View file

@ -57,6 +57,7 @@ Pop EAX
Pop EBP
DebugStub_SetINT1_TrapFLAG_Exit:
Ret
DebugStub_ResetINT1_TrapFLAG:
Push EBP
Push EAX

1
source2/Compiler/Cosmos.Compiler.DebugStub/AsmBreak.xs
View file

@ -71,6 +71,7 @@ function SetINT1_TrapFLAG {
-EAX
-EBP
}
function ResetINT1_TrapFLAG {
//Push EAX to make sure whatever we do below doesn't affect code afterwards
+EBP

61
source2/Compiler/Cosmos.XSharp/AsmGenerator.cs
View file

@ -7,9 +7,9 @@ using System.IO;
using XSharp.Nasm;
namespace Cosmos.Compiler.XSharp {
/// <summary>This class performs the translation from X# source code into a target
/// assembly language. At current time the only supported assembler syntax is NASM.
/// </summary>
// This class performs the translation from X# source code into a target
// assembly language. At current time the only supported assembler syntax is NASM.
public class AsmGenerator {
protected TokenPatterns mPatterns = new TokenPatterns();
@ -20,11 +20,11 @@ namespace Cosmos.Compiler.XSharp {
/// <summary>Invoke this method when end of source code file is reached to make sure the last
/// function or interrupt handler has well balanced opening/closing curly braces.</summary>
private void AssertLastFunctionComplete()
{
if (!mPatterns.InFunctionBody) { return; }
throw new Exception(
"The last function or interrupt handler from source code file is missing a curly brace.");
private void AssertLastFunctionComplete() {
if (!mPatterns.InFunctionBody) {
return;
}
throw new Exception("The last function or interrupt handler from source code file is missing a curly brace.");
}
/// <summary>Parse the input X# source code file and generate the matching target assembly
@ -33,28 +33,25 @@ namespace Cosmos.Compiler.XSharp {
/// <returns>The resulting target assembler content. The returned object contains
/// a code and a data block.</returns>
public Assembler Generate(string aSrcPathname) {
mPatterns.EmitUserComments = EmitUserComments;
mLineNo = 0;
var xResult = new Assembler();
using (var xInput = new StreamReader(aSrcPathname))
{
// Read one X# source code line at a time and process it.
while (true)
{
mLineNo++;
string xLine = xInput.ReadLine();
if (xLine == null)
{
break;
}
mPatterns.EmitUserComments = EmitUserComments;
mLineNo = 0;
var xResult = new Assembler();
using (var xInput = new StreamReader(aSrcPathname)) {
// Read one X# source code line at a time and process it.
while (true) {
mLineNo++;
string xLine = xInput.ReadLine();
if (xLine == null) {
break;
}
var xAsm = ProcessLine(xLine, mLineNo);
xResult.Data.AddRange(xAsm.Data);
xResult.Code.AddRange(xAsm.Code);
}
}
AssertLastFunctionComplete();
return xResult;
var xAsm = ProcessLine(xLine, mLineNo);
xResult.Data.AddRange(xAsm.Data);
xResult.Code.AddRange(xAsm.Code);
}
}
AssertLastFunctionComplete();
return xResult;
}
/// <summary>Parse the input X# source code file and generate two new files with target
@ -81,8 +78,7 @@ namespace Cosmos.Compiler.XSharp {
mPatterns.EmitUserComments = EmitUserComments;
mLineNo = 0;
// Read one X# source code line at a time and process it.
while (true)
{
while (true) {
mLineNo++;
string xLine = aInput.ReadLine();
if (xLine == null) {
@ -106,8 +102,7 @@ namespace Cosmos.Compiler.XSharp {
/// <param name="lineNumber">Line number for debugging and diagnostic messages.</param>
/// <returns>The resulting target assembler content. The returned object contains
/// a code and a data block.</returns>
protected Assembler ProcessLine(string aLine, int lineNumber)
{
protected Assembler ProcessLine(string aLine, int lineNumber) {
Assembler xAsm;
aLine = aLine.Trim();