Merge branch 'master' of https://github.com/mamedev/mame

makefile

@@ -846,6 +846,18 @@ vs2013_winrt: generate
 vs2015: generate
 	$(SILENT) $(GENIE) $(PARAMS) vs2015
 
+vs2015_intel: generate
+	$(SILENT) $(GENIE) $(PARAMS) --vs=intel-15 vs2015
+
+vs2015_xp: generate
+	$(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-xp vs2015
+
+vs2015_clang: generate
+	$(SILENT) $(GENIE) $(PARAMS) --vs=vs2013-clang vs2015
+
+vs2015_winrt: generate
+	$(SILENT) $(GENIE) $(PARAMS) --vs=winstore81 vs2015
+
 android-arm: generate
 ifndef ANDROID_NDK_ARM
 	$(error ANDROID_NDK_ARM is not set)

scripts/genie.lua

@@ -1254,9 +1254,9 @@ if _OPTIONS["vs"]=="intel-15" then
 			"/Qwd1478", 			-- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated
 			"/Qwd1879", 			-- warning #1879: unimplemented pragma ignored
 			"/Qwd3291", 			-- warning #3291: invalid narrowing conversion from "double" to "int"
-			"/Qwd1195",
+			"/Qwd1195", 			-- error #1195: conversion from integer to smaller pointer
-			"/Qwd1786",
+			"/Qwd47",				-- error #47: incompatible redefinition of macro "xxx"
-			"/Qwd592", -- For lua, false positive?
+			"/Qwd265",				-- error #265: floating-point operation result is out of range
 		}
 end
 

scripts/src/3rdparty.lua

@@ -24,6 +24,14 @@ project "expat"
 			"/wd4127", -- warning C4127: conditional expression is constant
 			"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
 		}
+if _OPTIONS["vs"]=="intel-15" then
+		buildoptions {
+			"/Qwd111",  			-- remark #111: statement is unreachable
+			"/Qwd1879", 			-- warning #1879: unimplemented pragma ignored
+			"/Qwd2557", 			-- remark #2557: comparison between signed and unsigned operands
+			"/Qwd869",  			-- remark #869: parameter "xxx" was never referenced
+		}
+end
 	configuration { "vs2015" }
 		buildoptions {
 			"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
@@ -56,7 +64,12 @@ project "zlib"
 			"/wd4127", -- warning C4127: conditional expression is constant
 			"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
 		}
-
+if _OPTIONS["vs"]=="intel-15" then
+		buildoptions {
+			"/Qwd111",  			-- remark #111: statement is unreachable
+			"/Qwd280",  			-- remark #280: selector expression is constant
+		}
+end
 	configuration "Debug"
 		defines {
 			"verbose=-1",
@@ -106,7 +119,11 @@ project "softfloat"
 	includedirs {
 		MAME_DIR .. "src/osd",
 	}
-	
+if _OPTIONS["vs"]=="intel-15" then
+		buildoptions {
+			"/Qwd2557", 			-- remark #2557: comparison between signed and unsigned operands
+		}
+end	
 	files {
 		MAME_DIR .. "3rdparty/softfloat/softfloat.c",
 		MAME_DIR .. "3rdparty/softfloat/fsincos.c",
@@ -128,6 +145,11 @@ project "jpeg"
 			"/wd4127", -- warning C4127: conditional expression is constant
 			"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
 		}
+if _OPTIONS["vs"]=="intel-15" then
+		buildoptions {
+			"/Qwd869",  			-- remark #869: parameter "xxx" was never referenced
+		}
+end	
 
 	configuration { }
 
@@ -201,6 +223,15 @@ project "flac"
 			"/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter	
 			"/wd4702", -- warning C4702: unreachable code
 		}
+if _OPTIONS["vs"]=="intel-15" then
+		buildoptions {
+			"/Qwd111",  			-- remark #111: statement is unreachable
+			"/Qwd177",  			-- remark #177: function "xxx" was declared but never referenced
+			"/Qwd181",  			-- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int"
+			"/Qwd188",  			-- error #188: enumerated type mixed with another type
+			"/Qwd869",  			-- remark #869: parameter "xxx" was never referenced
+		}
+end	
 
 	configuration { "vs2015" }
 		buildoptions {
@@ -269,6 +300,11 @@ project "7z"
 		buildoptions {
 			"/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
 		}
+if _OPTIONS["vs"]=="intel-15" then
+		buildoptions {
+			"/Qwd869",  			-- remark #869: parameter "xxx" was never referenced
+		}
+end
 	configuration { "vs2015" }
 		buildoptions {
 			"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
@@ -326,7 +362,11 @@ project "lua"
 			"/wd4702", -- warning C4702: unreachable code
 			"/wd4310", -- warning C4310: cast truncates constant value
 		}
-
+if _OPTIONS["vs"]=="intel-15" then
+		buildoptions {
+			"/Qwd592", -- error #592: variable "xxx" is used before its value is set
+		}
+end
 	configuration { }
 		defines {
 			"LUA_COMPAT_ALL",
@@ -467,6 +507,12 @@ project "sqllite3"
 			"/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter
 			"/wd4706", -- warning C4706: assignment within conditional expression
 		}
+if _OPTIONS["vs"]=="intel-15" then
+		buildoptions {
+			"/Qwd869",  			-- remark #869: parameter "xxx" was never referenced
+			"/Qwd2557", 			-- remark #2557: comparison between signed and unsigned operands
+		}
+end
 
 	configuration { "vs2015" }
 		buildoptions {
@@ -521,6 +567,14 @@ project "portmidi"
 			"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
 			"/wd4706", -- warning C4706: assignment within conditional expression
 		}
+if _OPTIONS["vs"]=="intel-15" then
+		buildoptions {
+			"/Qwd188",  			-- error #188: enumerated type mixed with another type
+			"/Qwd344",  			-- remark #344: typedef name has already been declared (with same type)
+			"/Qwd869",  			-- remark #869: parameter "xxx" was never referenced
+			"/Qwd2557", 			-- remark #2557: comparison between signed and unsigned operands
+		}
+end
 
 	configuration { "vs2015" }
 		buildoptions {
@@ -595,7 +649,13 @@ project "bgfx"
 			"/wd4611", -- warning C4611: interaction between '_setjmp' and C++ object destruction is non-portable
 			"/wd4310", -- warning C4310: cast truncates constant value			
 		}
-
+if _OPTIONS["vs"]=="intel-15" then
+		buildoptions {
+			"/Qwd906",  			-- message #906: effect of this "#pragma pack" directive is local to function "xxx"
+			"/Qwd1879", 			-- warning #1879: unimplemented pragma ignored
+			"/Qwd82",   			-- remark #82: storage class is not first
+		}
+end
 	configuration { }
 
 	includedirs {		
@@ -714,7 +774,14 @@ project "portaudio"
 			"/wd4189", -- warning C4189: 'xxx' : local variable is initialized but not referenced
 			"/wd4127", -- warning C4127: conditional expression is constant
 		}
-
+if _OPTIONS["vs"]=="intel-15" then
+		buildoptions {
+			"/Qwd869",  			-- remark #869: parameter "xxx" was never referenced
+			"/Qwd1478", 			-- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated
+			"/Qwd2544", 			-- message #2544: empty dependent statement in if-statement
+			"/Qwd1879", 			-- warning #1879: unimplemented pragma ignored
+		}
+end
 	configuration { "vs2015" }
 		buildoptions {
 			"/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration
@@ -856,6 +923,13 @@ project "gtest"
 			"-Wno-unused-variable",
 		}
 
+	configuration { "vs*" }
+if _OPTIONS["vs"]=="intel-15" then
+		buildoptions {
+			"/Qwd1195", 			-- error #1195: conversion from integer to smaller pointer
+		}
+end
+
 	configuration { }
 
 	includedirs {

src/devices/cpu/dsp56k/dsp56mem.h

@@ -13,10 +13,10 @@ namespace DSP56K
 void mem_reset(dsp56k_core* cpustate);
 
 // Adjusts the documented address to match the offset in peripheral RAM
-#define A2O(a) (a-0xffc0)
+#define A2O(a) (a - 0xffc0)
 
 // Adjusts the offset in peripheral RAM to match the documented address
-#define O2A(a) (a+0xffc0)
+#define O2A(a) (a + 0xffc0)
 
 // The memory 'registers'
 #define PBC      (cpustate->peripheral_ram[A2O(0xffc0)])

src/devices/cpu/i86/i286.cpp

@@ -1292,7 +1292,7 @@ m_limit[sreg] = LIMIT(desc); }
 							LOADDESC(0x848, DS);
 #undef LOADDESC
 							// void cast supresses warning
-#define LOADDESC(addr, reg, r) { desc[1] = read_word(addr); desc[2] = read_word(addr+2); desc[0] = read_word(addr+4); \
+#define LOADDESC(addr, reg, r) { desc[1] = read_word(addr); desc[2] = read_word(addr + 2); desc[0] = read_word(addr + 4); \
 reg.base = BASE(desc); (void)(r); reg.limit = LIMIT(desc); }
 							LOADDESC(0x84e, m_gdtr, 1);
 							LOADDESC(0x854, m_ldtr, m_ldtr.rights = RIGHTS(desc));

src/mame/drivers/namcos23.cpp

@@ -3055,7 +3055,7 @@ READ16_MEMBER(namcos23_state::mcu_pb_r)
 
 WRITE16_MEMBER(namcos23_state::mcu_pb_w)
 {
-	m_sub_portb = (m_sub_portb & 0x80) | (data & 0x7f);
+	m_sub_portb = (m_sub_portb & 0xc0) | (data & 0x3f);
 	m_rtc->ce_w((m_sub_portb & 0x20) && (m_sub_porta & 1));
 	m_settings->ce_w((m_sub_portb & 0x20) && !(m_sub_porta & 1));
 }

src/mame/includes/chihiro.h

@@ -232,11 +232,10 @@ public:
 		depthbuffer = NULL;
 		displayedtarget = NULL;
 		puller_channel = 0;
-		puller_subchannel = 0;
 		puller_waiting = 0;
 		debug_grab_texttype = -1;
 		debug_grab_textfile = NULL;
-		waitvblank_used = 0;
+		waitvblank_used = 1;
 		memset(vertex_attribute_words, 0, sizeof(vertex_attribute_words));
 		memset(vertex_attribute_offset, 0, sizeof(vertex_attribute_offset));
 	}
@@ -254,9 +253,10 @@ public:
 	int geforce_commandkind(UINT32 word);
 	UINT32 geforce_object_offset(UINT32 handle);
 	void geforce_read_dma_object(UINT32 handle, UINT32 &offset, UINT32 &size);
+	void geforce_assign_object(address_space &space, UINT32 chanel, UINT32 subchannel, UINT32 address);
 	int geforce_exec_method(address_space &space, UINT32 channel, UINT32 subchannel, UINT32 method, UINT32 address, int &countlen);
 	UINT32 texture_get_texel(int number, int x, int y);
-	UINT8 *read_pixel(int x, int y, UINT32 c[4]);
+	UINT8 *read_pixel(int x, int y, INT32 c[4]);
 	void write_pixel(int x, int y, UINT32 color, UINT32 depth);
 	void combiner_initialize_registers(UINT32 argb8[6]);
 	void combiner_initialize_stage(int stage_number);
@@ -496,7 +496,6 @@ public:
 	int vertex_attribute_offset[16];
 	emu_timer *puller_timer;
 	int puller_channel;
-	int puller_subchannel;
 	int puller_waiting;
 	address_space *puller_space;
 	UINT32 dilated0[16][2048];
@@ -660,15 +659,16 @@ public:
 		NV2A_RT_DEPTH_FORMAT_Z16 = 0x0001,
 		NV2A_RT_DEPTH_FORMAT_Z24S8 = 0x0002
 	};
-
 	enum NV2A_COLOR_FORMAT {
-		NV2A_COLOR_FORMAT_X1R5G6B5 = 0x0002,
+		NV2A_COLOR_FORMAT_X1R5G5B5_Z1R5G5B5 = 1,
-		NV2A_COLOR_FORMAT_R5G6B5 = 0x0003,
+		NV2A_COLOR_FORMAT_X1R5G5B5_X1R5G5B5 = 2,
-		NV2A_COLOR_FORMAT_UNKNOWN4 = 0x0004,
+		NV2A_COLOR_FORMAT_R5G6B5 = 3,
-		NV2A_COLOR_FORMAT_X8R8G8B8 = 0x0005,
+		NV2A_COLOR_FORMAT_X8R8G8B8_Z8R8G8B8 = 4,
-		NV2A_COLOR_FORMAT_X1A7R8G8B8 = 0x0007,
+		NV2A_COLOR_FORMAT_X8R8G8B8_X8R8G8B8 = 5,
-		NV2A_COLOR_FORMAT_A8R8G8B8 = 0x0008,
+		NV2A_COLOR_FORMAT_X1A7R8G8B8_Z1A7R8G8B8 = 6,
-		NV2A_COLOR_FORMAT_B8 = 0x0009,
+		NV2A_COLOR_FORMAT_X1A7R8G8B8_X1A7R8G8B8 = 7,
-		NV2A_COLOR_FORMAT_G8B8 = 0x000a
+		NV2A_COLOR_FORMAT_A8R8G8B8 = 8,
+		NV2A_COLOR_FORMAT_B8 = 9,
+		NV2A_COLOR_FORMAT_G8B8 = 10
 	};
 };

src/mame/machine/naomim2.cpp

@@ -11,6 +11,11 @@ Naomi cartridge type M2/3 mapping
 
 NAOMI_ROM_OFFSET bit29: ROM size/mapping selection, 0 - 4MB ROM mode, 1 - 8MB ROM mode
 
+bit28: Bank selection.
+	in the case of flash-based 171-7885A ROM boards two of them can be stacked at once
+	onto main board. each must be configured as Bank 0 or 1 via some (currently unknown) jumper.
+	this bit selects which one ROM board will be accessed.
+
 note: if ROM is not mounted its area readed as 0xFF
 
 8MB ROM mode:
@@ -166,13 +171,13 @@ void naomi_m2_board::board_advance(UINT32 size)
 void naomi_m2_board::board_write(offs_t offset, UINT16 data)
 {
 	if(offset & 0x40000000) {
-		if((offset & 0x0f000000) == 0x02000000) {
+		if(offset & 0x00020000) {
 			offset &= RAM_SIZE-1;
 			ram[offset] = data;
 			ram[offset+1] = data >> 8;
 			return;
 		}
-		switch(offset & 0x1fffffff) {
+		switch(offset & 0x1ffff) {
 		case 0x1fff8: m_cryptdevice->set_addr_low(data); return;
 		case 0x1fffa: m_cryptdevice->set_addr_high(data);  return;
 		case 0x1fffc: m_cryptdevice->set_subkey(data); return;

src/mame/machine/xbox.cpp

@@ -1190,7 +1190,7 @@ static UINT32 hubintiasbridg_pci_r(device_t *busdevice, device_t *device, int fu
 static void hubintiasbridg_pci_w(device_t *busdevice, device_t *device, int function, int reg, UINT32 data, UINT32 mem_mask)
 {
 #ifdef LOG_PCI
-	if (reg >= 16) device->logerror("  bus:0 function:%d register:%d data:%08X mask:%08X\n", function, reg, data, mem_mask);
+	if (reg >= 16) busdevice->logerror("  bus:0 function:%d register:%d data:%08X mask:%08X\n", function, reg, data, mem_mask);
 #endif
 }
 
@@ -1209,7 +1209,7 @@ static UINT32 dummy_pci_r(device_t *busdevice, device_t *device, int function, i
 static void dummy_pci_w(device_t *busdevice, device_t *device, int function, int reg, UINT32 data, UINT32 mem_mask)
 {
 #ifdef LOG_PCI
-	if (reg >= 16) device->logerror("  bus:0 function:%d register:%d data:%08X mask:%08X\n", function, reg, data, mem_mask);
+	if (reg >= 16) busdevice->logerror("  bus:0 function:%d register:%d data:%08X mask:%08X\n", function, reg, data, mem_mask);
 #endif
 }
 

src/mame/video/chihiro.cpp

@@ -1240,7 +1240,7 @@ UINT32 nv2a_renderer::texture_get_texel(int number, int x, int y)
 	}
 }
 
-inline UINT8 *nv2a_renderer::read_pixel(int x, int y, UINT32 c[4])
+inline UINT8 *nv2a_renderer::read_pixel(int x, int y, INT32 c[4])
 {
 	UINT32 offset;
 	UINT32 color;
@@ -1261,8 +1261,8 @@ inline UINT8 *nv2a_renderer::read_pixel(int x, int y, UINT32 c[4])
 		c[1] = pal6bit((color & 0x07e0) >> 5);
 		c[0] = pal5bit(color & 0x1f);
 		return (UINT8 *)addr16;
-	case NV2A_COLOR_FORMAT_UNKNOWN4:
+	case NV2A_COLOR_FORMAT_X8R8G8B8_Z8R8G8B8:
-	case NV2A_COLOR_FORMAT_X8R8G8B8:
+	case NV2A_COLOR_FORMAT_X8R8G8B8_X8R8G8B8:
 		addr = (UINT32 *)((UINT8 *)rendertarget + offset);
 		color = *addr;
 
@@ -1295,7 +1295,7 @@ void nv2a_renderer::write_pixel(int x, int y, UINT32 color, UINT32 depth)
 	UINT32 *daddr32;
 	UINT16 *daddr16;
 	UINT32 deptsten;
-	UINT32 c[4], fb[4], s[4], d[4], cc[4];
+	INT32 c[4], fb[4], s[4], d[4], cc[4];
 	UINT32 dep, sten, stenc, stenv;
 	bool stencil_passed;
 	bool depth_passed;
@@ -1854,16 +1854,16 @@ void nv2a_renderer::write_pixel(int x, int y, UINT32 color, UINT32 depth)
 	if (color_mask != 0) {
 		UINT32 ct,ft,w;
 
-		ct = (c[3] << 24) | (c[2] << 16) | (c[1] << 8) | c[0];
+		ct = ((UINT32)c[3] << 24) | ((UINT32)c[2] << 16) | ((UINT32)c[1] << 8) | (UINT32)c[0];
-		ft = (fb[3] << 24) | (fb[2] << 16) | (fb[1] << 8) | fb[0];
+		ft = ((UINT32)fb[3] << 24) | ((UINT32)fb[2] << 16) | ((UINT32)fb[1] << 8) | (UINT32)fb[0];
 		w = (ft & ~color_mask) | (ct & color_mask);
 		switch (colorformat_rendertarget) {
 		case NV2A_COLOR_FORMAT_R5G6B5:
 			w = ((w >> 8) & 0xf800) + ((w >> 5) & 0x7e0) + ((w >> 3) & 0x1f);
 			*((UINT16 *)addr) = (UINT16)w;
 			break;
-		case NV2A_COLOR_FORMAT_UNKNOWN4:
+		case NV2A_COLOR_FORMAT_X8R8G8B8_Z8R8G8B8:
-		case NV2A_COLOR_FORMAT_X8R8G8B8:
+		case NV2A_COLOR_FORMAT_X8R8G8B8_X8R8G8B8:
 			*((UINT32 *)addr) = w;
 			break;
 		case NV2A_COLOR_FORMAT_A8R8G8B8:
@@ -2862,7 +2862,7 @@ int nv2a_renderer::geforce_exec_method(address_space & space, UINT32 chanel, UIN
 			m = 1;
 		// possible buffers: color, depth, stencil
 		// clear framebuffer
-		if (data & 0xf0) {
+		if ((data & 0xf0) == 0xf0) {
 			if (bytespixel_rendertarget == 4) {
 				bitmap_rgb32 bm(rendertarget, (limits_rendertarget.right() + 1) * m, (limits_rendertarget.bottom() + 1) * m, pitch_rendertarget / 4);
 
@@ -2913,8 +2913,8 @@ int nv2a_renderer::geforce_exec_method(address_space & space, UINT32 chanel, UIN
 		case NV2A_COLOR_FORMAT_R5G6B5:
 			bytespixel_rendertarget = 2;
 			break;
-		case NV2A_COLOR_FORMAT_UNKNOWN4:
+		case NV2A_COLOR_FORMAT_X8R8G8B8_Z8R8G8B8:
-		case NV2A_COLOR_FORMAT_X8R8G8B8:
+		case NV2A_COLOR_FORMAT_X8R8G8B8_X8R8G8B8:
 		case NV2A_COLOR_FORMAT_A8R8G8B8:
 			bytespixel_rendertarget = 4;
 			break;
@@ -4018,10 +4018,28 @@ UINT32 nv2a_renderer::screen_update_callback(screen_device &screen, bitmap_rgb32
 	return 0;
 }
 
+void nv2a_renderer::geforce_assign_object(address_space & space, UINT32 chanel, UINT32 subchannel, UINT32 address)
+{
+	int handle, objclass;
+
+	handle = space.read_dword(address);
+	handle = geforce_object_offset(handle);
+#ifdef LOG_NV2A
+	machine().logerror("  assign to subchannel %d object at %d", subch, handle);
+#endif
+	channel[chanel][subchannel].object.objhandle = handle;
+	handle = ramin[handle / 4];
+	objclass = handle & 0xff;
+#ifdef LOG_NV2A
+	machine().logerror(" class %03X\n", objclass);
+#endif
+	channel[chanel][subchannel].object.objclass = objclass;
+}
+
 TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work)
 {
-	int chanel, subchannel;
+	int chanel;
-	int method, count, handle, objclass;
+	int method, count;
 	UINT32 *dmaput, *dmaget;
 	UINT32 cmd, cmdtype;
 	int countlen;
@@ -4030,9 +4048,8 @@ TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work)
 	UINT32 subch;
 
 	chanel = puller_channel;
-	subchannel = puller_subchannel;
+	dmaput = &channel[chanel][0].regs[0x40 / 4];
-	dmaput = &channel[chanel][subchannel].regs[0x40 / 4];
+	dmaget = &channel[chanel][0].regs[0x44 / 4];
-	dmaget = &channel[chanel][subchannel].regs[0x44 / 4];
 	while (*dmaget != *dmaput) {
 		cmd = space->read_dword(*dmaget);
 		*dmaget += 4;
@@ -4041,11 +4058,11 @@ TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work)
 		{
 		case 6: // jump
 #ifdef LOG_NV2A
-			printf("jump dmaget %08X", *dmaget);
+			machine().logerror("jump dmaget %08X", *dmaget);
 #endif
 			*dmaget = cmd & 0xfffffffc;
 #ifdef LOG_NV2A
-			printf(" -> %08X\n\r", *dmaget);
+			machine().logerror(" -> %08X\n\r", *dmaget);
 #endif
 			break;
 		case 0: // increasing method
@@ -4053,18 +4070,7 @@ TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work)
 			subch = (cmd >> 13) & 7;
 			count = (cmd >> 18) & 2047;
 			if ((method == 0) && (count == 1)) {
-				handle = space->read_dword(*dmaget);
+				geforce_assign_object(*space, chanel, subch, *dmaget);
-				handle = geforce_object_offset(handle);
-#ifdef LOG_NV2A
-				machine().logerror("  assign to subchannel %d object at %d", subch, handle);
-#endif
-				channel[chanel][subch].object.objhandle = handle;
-				handle = ramin[handle / 4];
-				objclass = handle & 0xff;
-#ifdef LOG_NV2A
-				machine().logerror(" class %03X\n", objclass);
-#endif
-				channel[chanel][subch].object.objclass = objclass;
 				*dmaget += 4;
 			}
 			else {
@@ -4093,18 +4099,7 @@ TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work)
 			subch = (cmd >> 13) & 7;
 			count = (cmd >> 18) & 2047;
 			if ((method == 0) && (count == 1)) {
-				handle = space->read_dword(*dmaget);
+				geforce_assign_object(*space, chanel, subch, *dmaget);
-				handle = geforce_object_offset(handle);
-#ifdef LOG_NV2A
-				machine().logerror("  assign to subchannel %d object at %d", subch, handle);
-#endif
-				channel[chanel][subch].object.objhandle = handle;
-				handle = ramin[handle / 4];
-				objclass = handle & 0xff;
-#ifdef LOG_NV2A
-				machine().logerror(" class %03X\n", objclass);
-#endif
-				channel[chanel][subch].object.objclass = objclass;
 				*dmaget += 4;
 			}
 			else {
@@ -4125,18 +4120,7 @@ TIMER_CALLBACK_MEMBER(nv2a_renderer::puller_timer_work)
 			count = space->read_dword(*dmaget);
 			*dmaget += 4;
 			if ((method == 0) && (count == 1)) {
-				handle = space->read_dword(*dmaget);
+				geforce_assign_object(*space, chanel, subch, *dmaget);
-				handle = geforce_object_offset(handle);
-#ifdef LOG_NV2A
-				machine().logerror("  assign to subchannel %d object at %d", subch, handle);
-#endif
-				channel[chanel][subch].object.objhandle = handle;
-				handle = ramin[handle / 4];
-				objclass = handle & 0xff;
-#ifdef LOG_NV2A
-				machine().logerror(" class %03X\n", objclass);
-#endif
-				channel[chanel][subch].object.objclass = objclass;
 				*dmaget += 4;
 			}
 			else {
@@ -4294,16 +4278,16 @@ WRITE32_MEMBER(nv2a_renderer::geforce_w)
 		subchannel = (suboffset >> (13 - 2)) & 7;
 		suboffset = suboffset & 0x7ff;
 		//machine().logerror("NV_2A: write channel[%02X,%d,%04X]=%08X\n",chanel,subchannel,suboffset*4,data & mem_mask);
+		COMBINE_DATA(&channel[chanel][subchannel].regs[suboffset]);
 		if (suboffset >= 0x80 / 4)
 			return;
-		COMBINE_DATA(&channel[chanel][subchannel].regs[suboffset]);
 		if ((suboffset == 0x40 / 4) || (suboffset == 0x44 / 4)) { // DMA_PUT or DMA_GET
 			UINT32 *dmaput, *dmaget;
 
-			dmaput = &channel[chanel][subchannel].regs[0x40 / 4];
+			dmaput = &channel[chanel][0].regs[0x40 / 4];
-			dmaget = &channel[chanel][subchannel].regs[0x44 / 4];
+			dmaget = &channel[chanel][0].regs[0x44 / 4];
 			//printf("dmaget %08X dmaput %08X\n\r",*dmaget,*dmaput);
-			if ((*dmaput == 0x048cf000) && (*dmaget == 0x07f4d000)) {
+			if ((*dmaput == 0x048cf000) && (*dmaget == 0x07f4d000)) { // only for outr2
 				*dmaget = *dmaput;
 				puller_waiting = 0;
 				puller_timer->enable(false);
@@ -4312,7 +4296,6 @@ WRITE32_MEMBER(nv2a_renderer::geforce_w)
 			if (*dmaget != *dmaput) {
 				if (puller_waiting == 0) {
 					puller_channel = chanel;
-					puller_subchannel = subchannel;
 					puller_space = &space;
 					puller_timer->enable();
 					puller_timer->adjust(attotime::zero);