Skip to content

Commit

Permalink
Converted from .NET 1 to .NET 4.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
shanselman committed Jun 30, 2017
1 parent fe9c2d1 commit da54d8d
Show file tree
Hide file tree
Showing 14 changed files with 823 additions and 2,419 deletions.
294 changes: 294 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,294 @@

# Created by https://www.gitignore.io/api/csharp

### Csharp ###
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

# User-specific files
*.suo
*.user
*.userosscache
*.sln.docstates

# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs

# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/

# Visual Studio 2015 cache/options directory
.vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

# NUNIT
*.VisualState.xml
TestResult.xml

# Build Results of an ATL Project
[Dd]ebugPS/
[Rr]eleasePS/
dlldata.c

# .NET Core
project.lock.json
project.fragment.lock.json
artifacts/
**/Properties/launchSettings.json

*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.svclog
*.scc

# Chutzpah Test files
_Chutzpah*

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opendb
*.opensdf
*.sdf
*.cachefile
*.VC.db
*.VC.VC.opendb

# Visual Studio profiler
*.psess
*.vsp
*.vspx
*.sap

# TFS 2012 Local Workspace
$tf/

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user

# JustCode is a .NET coding add-in
.JustCode

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# Visual Studio code coverage results
*.coverage
*.coveragexml

# NCrunch
_NCrunch_*
.*crunch*.local.xml
nCrunchTemp_*

# MightyMoose
*.mm.*
AutoTest.Net/

# Web workbench (sass)
.sass-cache/

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj

# Microsoft Azure Web App publish settings. Comment the next line if you want to
# checkin your Azure Web App publish settings, but sensitive information contained
# in these scripts will be unencrypted
PublishScripts/

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets

# Microsoft Azure Build Output
csx/
*.build.csdef

# Microsoft Azure Emulator
ecf/
rcf/

# Windows Store app package directories and files
AppPackages/
BundleArtifacts/
Package.StoreAssociation.xml
_pkginfo.txt

# Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/

# Others
ClientBin/
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
orleans.codegen.cs

# Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file
# to a newer Visual Studio version. Backup files are not needed,
# because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
*.mdf
*.ldf
*.ndf

# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings

# Microsoft Fakes
FakesAssemblies/

# GhostDoc plugin setting file
*.GhostDoc.xml

# Node.js Tools for Visual Studio
.ntvs_analysis.dat
node_modules/

# Typescript v1 declaration files
typings/

# Visual Studio 6 build log
*.plg

# Visual Studio 6 workspace options file
*.opt

# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw

# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions

# Paket dependency manager
.paket/paket.exe
paket-files/

# FAKE - F# Make
.fake/

# JetBrains Rider
.idea/
*.sln.iml

# CodeRush
.cr/

# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc

# Cake - Uncomment if you are using it
# tools/**
# !tools/packages.config

# Telerik's JustMock configuration file
*.jmconfig

# BizTalk build output
*.btp.cs
*.btm.cs
*.odx.cs
*.xsd.cs

# End of https://www.gitignore.io/api/csharp
8 changes: 4 additions & 4 deletions OS Project/CPU.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public abstract class CPU
/// <param name="memorySize">The size of physical memory</param>
public static void initPhysicalMemory(uint memorySize)
{
pageSize = uint.Parse(ConfigurationSettings.AppSettings["MemoryPageSize"]);
pageSize = uint.Parse(ConfigurationManager.AppSettings["MemoryPageSize"]);

uint newMemorySize = UtilRoundToBoundary(memorySize, CPU.pageSize);

Expand Down Expand Up @@ -218,7 +218,7 @@ public static void opCodeToSysCall(InstructionType opCode)
/// </summary>
public static void DumpRegisters()
{
if (bool.Parse(ConfigurationSettings.AppSettings["DumpRegisters"]) == false)
if (bool.Parse(ConfigurationManager.AppSettings["DumpRegisters"]) == false)
return;

Console.WriteLine("CPU Registers: r1 {0,-8:G} r6 {1,-8:G}",registers[1],registers[6]);
Expand All @@ -235,7 +235,7 @@ public static void DumpRegisters()
/// </summary>
public static void DumpInstruction()
{
if (bool.Parse(ConfigurationSettings.AppSettings["DumpInstruction"]) == false)
if (bool.Parse(ConfigurationManager.AppSettings["DumpInstruction"]) == false)
return;

Console.WriteLine(" Pid:{0} {1} {2}",CPU.registers[8],(InstructionType)theOS.memoryMgr[theOS.currentProcess.PCB.pid,CPU.ip],(uint)theOS.memoryMgr[theOS.currentProcess.PCB.pid,CPU.ip]);
Expand All @@ -246,7 +246,7 @@ public static void DumpInstruction()
/// </summary>
public static void DumpPhysicalMemory()
{
if (bool.Parse(ConfigurationSettings.AppSettings["DumpPhysicalMemory"]) == false)
if (bool.Parse(ConfigurationManager.AppSettings["DumpPhysicalMemory"]) == false)
return;

int address = 0;
Expand Down
6 changes: 3 additions & 3 deletions OS Project/EntryPoint.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static void Main(string[] args)
bytesOfVirtualMemory = uint.Parse(args[0]);
AppSettingsReader appreader = new AppSettingsReader();

bytesOfPhysicalMemory = uint.Parse(ConfigurationSettings.AppSettings["PhysicalMemory"]);
bytesOfPhysicalMemory = uint.Parse(ConfigurationManager.AppSettings["PhysicalMemory"]);

// Setup static physical memory
CPU.initPhysicalMemory(bytesOfPhysicalMemory);
Expand All @@ -87,8 +87,8 @@ static void Main(string[] args)
if (File.Exists(args[i]))
{
Program p = Program.LoadProgram(args[i]);
Process rp = theOS.createProcess(p, uint.Parse(ConfigurationSettings.AppSettings["ProcessMemory"]));
Console.WriteLine("Process id {0} has {1} bytes of process memory and {2} bytes of heap",rp.PCB.pid,ConfigurationSettings.AppSettings["ProcessMemory"],rp.PCB.heapAddrEnd-rp.PCB.heapAddrStart);
Process rp = theOS.createProcess(p, uint.Parse(ConfigurationManager.AppSettings["ProcessMemory"]));
Console.WriteLine("Process id {0} has {1} bytes of process memory and {2} bytes of heap",rp.PCB.pid,ConfigurationManager.AppSettings["ProcessMemory"],rp.PCB.heapAddrEnd-rp.PCB.heapAddrStart);
p.DumpProgram();
}
}
Expand Down
6 changes: 3 additions & 3 deletions OS Project/MemoryManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,8 @@ public MemoryManager(uint virtualMemSizeIn)
//
// Cordon off some shared memory regions...these are setting the AppSettings
//
uint SharedRegionsSize = uint.Parse(ConfigurationSettings.AppSettings["SharedMemoryRegionSize"]);
uint SharedRegions = uint.Parse(ConfigurationSettings.AppSettings["NumOfSharedMemoryRegions"]);
uint SharedRegionsSize = uint.Parse(ConfigurationManager.AppSettings["SharedMemoryRegionSize"]);
uint SharedRegions = uint.Parse(ConfigurationManager.AppSettings["NumOfSharedMemoryRegions"]);
if (SharedRegions > 0 && SharedRegionsSize > 0)
{
uint TotalPagesNeeded = (uint)(SharedRegions*SharedRegionsSize/CPU.pageSize);
Expand Down Expand Up @@ -566,7 +566,7 @@ public void SetMemoryOfProcess(uint pid, uint start, uint length, byte newvalue)
/// <returns>the index in process memory of the shared region</returns>
public uint MapSharedMemoryToProcess(uint memoryRegion, uint pid)
{
uint SharedRegionsSize = uint.Parse(ConfigurationSettings.AppSettings["SharedMemoryRegionSize"]);
uint SharedRegionsSize = uint.Parse(ConfigurationManager.AppSettings["SharedMemoryRegionSize"]);
uint PagesNeeded = (uint)(SharedRegionsSize/CPU.pageSize);

uint startAddrProcessIndex;
Expand Down
Loading

0 comments on commit da54d8d

Please sign in to comment.