2 files changed, 23 insertions, 48 deletions

diff --git a/Mono.Cecil.Cil/CodeReader.cs b/Mono.Cecil.Cil/CodeReader.cs
index 38bba66..487b7b8 100644
--- a/Mono.Cecil.Cil/CodeReader.cs
+++ b/Mono.Cecil.Cil/CodeReader.cs
@@ -17,58 +17,38 @@ using RVA = System.UInt32;
 
 namespace Mono.Cecil.Cil {
 
-	sealed class CodeReader : ByteBuffer {
+	sealed class CodeReader : BinaryStreamReader {
 
 		readonly internal MetadataReader reader;
 
 		int start;
-		Section code_section;
 
-		MethodDefinition method;
 		MethodBody body;
 
 		int Offset {
-			get { return base.position - start; }
+			get { return Position - start; }
 		}
 
-		public CodeReader (Section section, MetadataReader reader)
-			: base (section.Data)
+		public CodeReader (MethodDefinition method, MetadataReader reader)
+			: base (reader.image.Stream)
 		{
-			this.code_section = section;
 			this.reader = reader;
+			this.reader.context = method;
+			this.Position = (int) reader.image.ResolveVirtualAddress ((uint) method.RVA);
 		}
 
-		public MethodBody ReadMethodBody (MethodDefinition method)
+		public static MethodBody ReadMethodBody (MethodDefinition method, MetadataReader metadata)
 		{
-			this.method = method;
-			this.body = new MethodBody (method);
+			var reader = new CodeReader (method, metadata);
+			reader.body = new MethodBody (method);
 
-			reader.context = method;
+			reader.ReadMethodBody ();
 
-			ReadMethodBody ();
-
-			return this.body;
-		}
-
-		public void MoveTo (int rva)
-		{
-			if (!IsInSection (rva)) {
-				code_section = reader.image.GetSectionAtVirtualAddress ((uint) rva);
-				Reset (code_section.Data);
-			}
-
-			base.position = rva - (int) code_section.VirtualAddress;
-		}
-
-		bool IsInSection (int rva)
-		{
-			return code_section.VirtualAddress <= rva && rva < code_section.VirtualAddress + code_section.SizeOfRawData;
+			return reader.body;
 		}
 
 		void ReadMethodBody ()
 		{
-			MoveTo (method.RVA);
-
 			var flags = ReadByte ();
 			switch (flags & 0x3) {
 			case 0x2: // tiny
@@ -77,7 +57,7 @@ namespace Mono.Cecil.Cil {
 				ReadCode ();
 				break;
 			case 0x3: // fat
-				base.position--;
+				Advance (-1);
 				ReadFatMethod ();
 				break;
 			default:
@@ -120,17 +100,17 @@ namespace Mono.Cecil.Cil {
 
 		void ReadCode ()
 		{
-			start = position;
+			start = Position;
 			var code_size = body.code_size;
 
-			if (code_size < 0 || buffer.Length <= (uint) (code_size + position))
+			if (code_size < 0 || Length <= (uint) (code_size + Position))
 				code_size = 0;
 
 			var end = start + code_size;
 			var instructions = body.instructions = new InstructionCollection ((code_size + 1) / 2);
 
-			while (position < end) {
-				var offset = base.position - start;
+			while (Position < end) {
+				var offset = Position - start;
 				var opcode = ReadOpCode ();
 				var current = new Instruction (offset, opcode);
 
@@ -305,7 +285,7 @@ namespace Mono.Cecil.Cil {
 
 		void ReadFatSection ()
 		{
-			position--;
+			Advance (-1);
 			var count = (ReadInt32 () >> 8) / 24;
 
 			ReadExceptionHandlers (
@@ -351,6 +331,7 @@ namespace Mono.Cecil.Cil {
 		void Align (int align)
 		{
 			align--;
+			var position = Position;
 			Advance (((position + align) & ~align) - position);
 		}
 
@@ -366,11 +347,6 @@ namespace Mono.Cecil.Cil {
 			var buffer = new ByteBuffer ();
 			symbols = new MethodSymbols (method.Name);
 
-			this.method = method;
-			reader.context = method;
-
-			MoveTo (method.RVA);
-
 			var flags = ReadByte ();
 
 			MetadataToken local_var_token;
@@ -383,8 +359,7 @@ namespace Mono.Cecil.Cil {
 				PatchRawCode (buffer, symbols.code_size, writer);
 				break;
 			case 0x3: // fat
-				base.position--;
-
+				Advance (-1);
 				PatchRawFatMethod (buffer, symbols, writer, out local_var_token);
 				break;
 			default:
@@ -501,9 +476,9 @@ namespace Mono.Cecil.Cil {
 
 		void PatchRawSection (ByteBuffer buffer, MetadataBuilder metadata)
 		{
-			var position = base.position;
+			var position = Position;
 			Align (4);
-			buffer.WriteBytes (base.position - position);
+			buffer.WriteBytes (Position - position);
 
 			const byte fat_format = 0x40;
 			const byte more_sects = 0x80;
@@ -534,7 +509,7 @@ namespace Mono.Cecil.Cil {
 
 		void PatchRawFatSection (ByteBuffer buffer, MetadataBuilder metadata)
 		{
-			position--;
+			Advance (-1);
 			var length = ReadInt32 ();
 			buffer.WriteInt32 (length);
 
diff --git a/Mono.Cecil.Cil/CodeWriter.cs b/Mono.Cecil.Cil/CodeWriter.cs
index 7f7d095..c103824 100644
--- a/Mono.Cecil.Cil/CodeWriter.cs
+++ b/Mono.Cecil.Cil/CodeWriter.cs
@@ -75,7 +75,7 @@ namespace Mono.Cecil.Cil {
 
 		void WriteUnresolvedMethodBody (MethodDefinition method)
 		{
-			var code_reader = metadata.module.Read (method, (_, reader) => reader.code);
+			var code_reader = metadata.module.Read (method, (m, reader) => new CodeReader (m, reader));
 
 			MethodSymbols symbols;
 			var buffer = code_reader.PatchRawMethodBody (method, this, out symbols);