From aa107d0635e622732127c836bf1e176f396bd915 Mon Sep 17 00:00:00 2001
From: copy <copy@copy.sh>
Date: Sun, 29 Dec 2013 00:46:03 +0100
Subject: [PATCH] Small fixups

---
 src/browser/main.js |  3 +--
 src/const.js        |  9 ++++++---
 src/ide.js          | 16 ++++++++--------
 src/string.macro.js |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/browser/main.js b/src/browser/main.js
index e4c688c5..80360b5b 100644
--- a/src/browser/main.js
+++ b/src/browser/main.js
@@ -221,8 +221,7 @@ function dump_file(ab, name)
      */
     function SyncFileBuffer(file)
     {
-        var filereader = new FileReader,
-            PART_SIZE = 4 << 20,
+        var PART_SIZE = 4 << 20,
             ready = false,
             me = this;
 
diff --git a/src/const.js b/src/const.js
index 457fa566..e458cbd8 100644
--- a/src/const.js
+++ b/src/const.js
@@ -14,7 +14,7 @@ VGA_MEMORY_SIZE = 128 * 64 * 1024,
  * @const 
  * @type {number}
  */
-memory_size = 1024 * 1024 * 128;
+memory_size = 1024 * 1024 * 64;
 
 var 
 
@@ -65,8 +65,11 @@ var
 /** @const */ TLB_USER_WRITE = 8;
 
 
-/** @const */
-var ENABLE_HPET = false,
+var 
+    /** @const */
+    ENABLE_HPET = false,
+
+    /** @const */
     ENABLE_ACPI = false;
 
 var 
diff --git a/src/ide.js b/src/ide.js
index 09a825ff..39f413a4 100644
--- a/src/ide.js
+++ b/src/ide.js
@@ -853,18 +853,18 @@ function IDEDevice(dev, buffer, is_cd, nr)
 
 
                 do {
-                    var addr = memory.read32s(prdt_start),
-                        count = memory.read16(prdt_start + 4),
+                    var prd_addr = memory.read32s(prdt_start),
+                        prd_count = memory.read16(prdt_start + 4),
                         end = memory.read8(prdt_start + 7) & 0x80;
 
-                    if(!count)
+                    if(!prd_count)
                     {
-                        count = 0x10000;
+                        prd_count = 0x10000;
                     }
 
-                    dbg_log("dma write dest=" + h(addr) + " count=" + h(count), LOG_DISK);
+                    dbg_log("dma write dest=" + h(prd_addr) + " prd_count=" + h(prd_count), LOG_DISK);
 
-                    me.buffer.set(start + offset, memory.mem8.subarray(addr, addr + count), function()
+                    me.buffer.set(start + offset, memory.mem8.subarray(prd_addr, prd_addr + prd_count), function()
                     {
                         prdt_write_count++;
 
@@ -878,7 +878,7 @@ function IDEDevice(dev, buffer, is_cd, nr)
                         }
                     });
 
-                    offset += count;
+                    offset += prd_count;
                     prdt_start += 8;
                     prdt_count++;
                 }
@@ -982,7 +982,7 @@ function IDEDevice(dev, buffer, is_cd, nr)
         return cylinder_high << 16 & 0x0F0000 | cylinder_low << 8 & 0xFF00 | sector & 0xFF;
     }
 
-    function create_identify_packet(buffer)
+    function create_identify_packet()
     {
         // http://bochs.sourceforge.net/cgi-bin/lxr/source/iodev/harddrv.cc#L2821
 
diff --git a/src/string.macro.js b/src/string.macro.js
index 3c1a12e2..57ff773a 100644
--- a/src/string.macro.js
+++ b/src/string.macro.js
@@ -31,7 +31,7 @@
 
 
 #define string_instruction(s, fn, aligned_fn)\
-    var src, dest, data_src, data_dest, phys_dest, phys_src;\
+    var src, dest, data_src, data_dest = 0, phys_dest, phys_src;\
     var size = flags & flag_direction ? -(s >> 3) : s >> 3;\
     var cont = false;\
     if(use_cmp && !use_si) data_src = s === 32 ? reg32s[reg_eax] : reg ## s[reg_al];\